]> lifelog.hopto.org Git - LifeLog.git/commitdiff
new hdr style
authorMetabox <redacted>
Thu, 25 Apr 2019 06:34:53 +0000 (16:34 +1000)
committerMetabox <redacted>
Thu, 25 Apr 2019 06:34:53 +0000 (16:34 +1000)
27 files changed:
.vstags
dbLifeLog/cgisess_03d0326a37715cad84058a32cda8b38b [new file with mode: 0644]
dbLifeLog/cgisess_05922b7b97b61f0fdcba214dc91c9738 [new file with mode: 0644]
dbLifeLog/cgisess_1b0f0c395cee908405ce4abd93f915cd [new file with mode: 0644]
dbLifeLog/cgisess_23c07400412016cf766e0cb37f319e49 [new file with mode: 0644]
dbLifeLog/cgisess_37a18b05f4cf19126540346512b4ccc6 [new file with mode: 0644]
dbLifeLog/cgisess_5168c949c9926132008c7f8cffeffd29 [new file with mode: 0644]
dbLifeLog/cgisess_5994e90a7f189bf777c9b1c3ff13c6c9 [new file with mode: 0644]
dbLifeLog/cgisess_72b09e20f9d2271a4b5260bd15bdc04c [new file with mode: 0644]
dbLifeLog/cgisess_8bede9858a84a16b5b3f82ff8591cf83 [new file with mode: 0644]
dbLifeLog/cgisess_9146fef782fca268013e627c7761c3df [new file with mode: 0644]
dbLifeLog/cgisess_9a645c7ea2c5cab825f38eff05f6e827 [new file with mode: 0644]
dbLifeLog/cgisess_a43ee1a582404afa93be9257c1a66889 [new file with mode: 0644]
dbLifeLog/cgisess_c95ad659e4ccd15be68518ec3a3122a2 [new file with mode: 0644]
dbLifeLog/cgisess_d855d3e09d1b30916579110e8efe9434 [new file with mode: 0644]
dbLifeLog/cgisess_dcbe5695e7c74b05d5fc548dd1c4aba7 [new file with mode: 0644]
dbLifeLog/cgisess_ece1806728575342a87c5ab9f7fd9d90 [new file with mode: 0644]
dbLifeLog/cgisess_f5781baa5eca7c3aa2d113e350ba3c7b [new file with mode: 0644]
dbLifeLog/cgisess_fee0fa239cfb8d01eb9939433622ac90 [new file with mode: 0644]
htdocs/cgi-bin/images/7_Inch_Android_4_0_Tablet_zzMn_tSh.jpg.thumb_70x70.jpg [new file with mode: 0644]
htdocs/cgi-bin/images/paw_to_hand_deal_done.jpg [new file with mode: 0644]
htdocs/cgi-bin/images/paw_to_hand_deal_done_frm.png [new file with mode: 0644]
htdocs/cgi-bin/main.cgi
htdocs/cgi-bin/tempCodeRunnerFile.cgi
htdocs/cgi-bin/wsrc/main.css
htdocs/cgi-bin/wsrc/main.js
htdocs/thttpd.pid

diff --git a/.vstags b/.vstags
index 12baa8dcf7e7ebcf616cf606bb7c5fbd0c0a8925..d0e62520b657cd5e84913f173775069a8b7bd936 100644 (file)
--- a/.vstags
+++ b/.vstags
@@ -7,19 +7,19 @@
 ConfirmedDelition      htdocs/cgi-bin/remove.cgi       151;"   s
 DisplayDateDiffs       htdocs/cgi-bin/remove.cgi       103;"   s
 NotConfirmed   htdocs/cgi-bin/remove.cgi       171;"   s
-authenticate   htdocs/cgi-bin/main.cgi 526;"   s
+authenticate   htdocs/cgi-bin/main.cgi 579;"   s
 big_money      htdocs/cgi-bin/stats.cgi        126;"   s
 boldDate       htdocs/cgi-bin/remove.cgi       145;"   s
 build  htdocs/cgi-bin/search.cgi       85;"    s
-buildNavigationButtons htdocs/cgi-bin/main.cgi 482;"   s
+buildNavigationButtons htdocs/cgi-bin/main.cgi 535;"   s
 changeSystemSettings   htdocs/cgi-bin/config.cgi       339;"   s
 checkCreateTables      htdocs/cgi-bin/login_ctr.cgi    112;"   s
 dateDiff       htdocs/cgi-bin/remove.cgi       137;"   s
 exportCategoriesToCSV  htdocs/cgi-bin/config.cgi       405;"   s
 exportLogToCSV htdocs/cgi-bin/config.cgi       375;"   s
 getConfiguration       htdocs/cgi-bin/config.cgi       317;"   s
-getConfiguration       htdocs/cgi-bin/main.cgi 569;"   s
-getConfiguration       htdocs/cgi-bin/remove.cgi       223;"   s
+getConfiguration       htdocs/cgi-bin/main.cgi 622;"   s
+getConfiguration       htdocs/cgi-bin/remove.cgi       229;"   s
 importCatCSV   htdocs/cgi-bin/config.cgi       437;"   s
 importLogCSV   htdocs/cgi-bin/config.cgi       478;"   s
 insertDefCats  htdocs/cgi-bin/login_ctr.cgi    216;"   s
@@ -30,11 +30,11 @@ main::populateConfig        htdocs/cgi-bin/login_ctr.cgi    231;"   s
 main::processSubmit    htdocs/cgi-bin/login_ctr.cgi    86;"    s
 main::removeOldSessions        htdocs/cgi-bin/login_ctr.cgi    242;"   s
 main::selSQLTbl        htdocs/cgi-bin/login_ctr.cgi    211;"   s
-parseDate      htdocs/cgi-bin/main.cgi 383;"   s
+parseDate      htdocs/cgi-bin/main.cgi 436;"   s
 populateConfig htdocs/cgi-bin/login_ctr.cgi    231;"   s
 processSubmit  htdocs/cgi-bin/config.cgi       214;"   s
 processSubmit  htdocs/cgi-bin/login_ctr.cgi    86;"    s
-processSubmit  htdocs/cgi-bin/main.cgi 397;"   s
+processSubmit  htdocs/cgi-bin/main.cgi 450;"   s
 removeOldSessions      htdocs/cgi-bin/login_ctr.cgi    242;"   s
 selSQLTbl      htdocs/cgi-bin/login_ctr.cgi    211;"   s
 selectSQL      htdocs/cgi-bin/stats.cgi        115;"   s
diff --git a/dbLifeLog/cgisess_03d0326a37715cad84058a32cda8b38b b/dbLifeLog/cgisess_03d0326a37715cad84058a32cda8b38b
new file mode 100644 (file)
index 0000000..de150fd
--- /dev/null
@@ -0,0 +1 @@
+$D = {'passw' => '42FAP5H0JUSZM','_SESSION_ATIME' => 1556108755,'_SESSION_CTIME' => 1556108356,'alias' => 'admin','_SESSION_ETIME' => 1200,'_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_ID' => '03d0326a37715cad84058a32cda8b38b','database' => 'data_admin_log.db'};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_05922b7b97b61f0fdcba214dc91c9738 b/dbLifeLog/cgisess_05922b7b97b61f0fdcba214dc91c9738
new file mode 100644 (file)
index 0000000..abf1a82
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_ATIME' => 1556162401,'_SESSION_ID' => '05922b7b97b61f0fdcba214dc91c9738','_SESSION_CTIME' => 1556162401};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_1b0f0c395cee908405ce4abd93f915cd b/dbLifeLog/cgisess_1b0f0c395cee908405ce4abd93f915cd
new file mode 100644 (file)
index 0000000..caccdbf
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_REMOTE_ADDR' => '127.0.0.1','alias' => 'admin','_SESSION_ATIME' => 1556172198,'_SESSION_ID' => '1b0f0c395cee908405ce4abd93f915cd','passw' => '42FAP5H0JUSZM','_SESSION_CTIME' => 1556171617,'_SESSION_ETIME' => 1200,'database' => 'data_admin_log.db'};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_23c07400412016cf766e0cb37f319e49 b/dbLifeLog/cgisess_23c07400412016cf766e0cb37f319e49
new file mode 100644 (file)
index 0000000..b7797c9
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_ID' => '23c07400412016cf766e0cb37f319e49','_SESSION_CTIME' => 1556107045,'_SESSION_ATIME' => 1556107045};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_37a18b05f4cf19126540346512b4ccc6 b/dbLifeLog/cgisess_37a18b05f4cf19126540346512b4ccc6
new file mode 100644 (file)
index 0000000..91045f3
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_CTIME' => 1556137622,'_SESSION_ATIME' => 1556137622,'_SESSION_ETIME' => 1800,'_SESSION_ID' => '37a18b05f4cf19126540346512b4ccc6','_SESSION_REMOTE_ADDR' => '127.0.0.1'};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_5168c949c9926132008c7f8cffeffd29 b/dbLifeLog/cgisess_5168c949c9926132008c7f8cffeffd29
new file mode 100644 (file)
index 0000000..53cf473
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_ATIME' => 1556102774,'_SESSION_CTIME' => 1556102774,'_SESSION_ID' => '5168c949c9926132008c7f8cffeffd29'};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_5994e90a7f189bf777c9b1c3ff13c6c9 b/dbLifeLog/cgisess_5994e90a7f189bf777c9b1c3ff13c6c9
new file mode 100644 (file)
index 0000000..b283237
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_ATIME' => 1556165538,'_SESSION_CTIME' => 1556165538,'_SESSION_ID' => '5994e90a7f189bf777c9b1c3ff13c6c9'};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_72b09e20f9d2271a4b5260bd15bdc04c b/dbLifeLog/cgisess_72b09e20f9d2271a4b5260bd15bdc04c
new file mode 100644 (file)
index 0000000..9d82ff0
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_CTIME' => 1556147306,'_SESSION_ID' => '72b09e20f9d2271a4b5260bd15bdc04c','_SESSION_ATIME' => 1556147306,'_SESSION_REMOTE_ADDR' => '127.0.0.1'};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_8bede9858a84a16b5b3f82ff8591cf83 b/dbLifeLog/cgisess_8bede9858a84a16b5b3f82ff8591cf83
new file mode 100644 (file)
index 0000000..1e1aa7d
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_ID' => '8bede9858a84a16b5b3f82ff8591cf83','_SESSION_CTIME' => 1556171617,'_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_ATIME' => 1556171617};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_9146fef782fca268013e627c7761c3df b/dbLifeLog/cgisess_9146fef782fca268013e627c7761c3df
new file mode 100644 (file)
index 0000000..d69ead7
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_ID' => '9146fef782fca268013e627c7761c3df','_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_ATIME' => 1556144700,'_SESSION_CTIME' => 1556144700};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_9a645c7ea2c5cab825f38eff05f6e827 b/dbLifeLog/cgisess_9a645c7ea2c5cab825f38eff05f6e827
new file mode 100644 (file)
index 0000000..3d29e33
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_ID' => '9a645c7ea2c5cab825f38eff05f6e827','_SESSION_ATIME' => 1556141562,'_SESSION_CTIME' => 1556141562};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_a43ee1a582404afa93be9257c1a66889 b/dbLifeLog/cgisess_a43ee1a582404afa93be9257c1a66889
new file mode 100644 (file)
index 0000000..99ffcaf
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_ATIME' => 1556160951,'_SESSION_CTIME' => 1556160951,'_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_ID' => 'a43ee1a582404afa93be9257c1a66889'};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_c95ad659e4ccd15be68518ec3a3122a2 b/dbLifeLog/cgisess_c95ad659e4ccd15be68518ec3a3122a2
new file mode 100644 (file)
index 0000000..2a2c3a3
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_ID' => 'c95ad659e4ccd15be68518ec3a3122a2','_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_CTIME' => 1556104820,'_SESSION_ATIME' => 1556104820};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_d855d3e09d1b30916579110e8efe9434 b/dbLifeLog/cgisess_d855d3e09d1b30916579110e8efe9434
new file mode 100644 (file)
index 0000000..7146c43
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_ID' => 'd855d3e09d1b30916579110e8efe9434','_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_CTIME' => 1556153591,'_SESSION_ATIME' => 1556153591};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_dcbe5695e7c74b05d5fc548dd1c4aba7 b/dbLifeLog/cgisess_dcbe5695e7c74b05d5fc548dd1c4aba7
new file mode 100644 (file)
index 0000000..e999588
--- /dev/null
@@ -0,0 +1 @@
+$D = {'alias' => 'admin','database' => 'data_admin_log.db','passw' => '42FAP5H0JUSZM','_SESSION_ETIME' => 1200,'_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_ID' => 'dcbe5695e7c74b05d5fc548dd1c4aba7','_SESSION_ATIME' => 1556168684,'_SESSION_CTIME' => 1556165538};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_ece1806728575342a87c5ab9f7fd9d90 b/dbLifeLog/cgisess_ece1806728575342a87c5ab9f7fd9d90
new file mode 100644 (file)
index 0000000..b5cf07a
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_ID' => 'ece1806728575342a87c5ab9f7fd9d90','_SESSION_ATIME' => 1556108356,'_SESSION_CTIME' => 1556108356};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_f5781baa5eca7c3aa2d113e350ba3c7b b/dbLifeLog/cgisess_f5781baa5eca7c3aa2d113e350ba3c7b
new file mode 100644 (file)
index 0000000..57cbc85
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_ATIME' => 1556131023,'_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_CTIME' => 1556131022,'_SESSION_ID' => 'f5781baa5eca7c3aa2d113e350ba3c7b','_SESSION_ETIME' => 1800};;$D
\ No newline at end of file
diff --git a/dbLifeLog/cgisess_fee0fa239cfb8d01eb9939433622ac90 b/dbLifeLog/cgisess_fee0fa239cfb8d01eb9939433622ac90
new file mode 100644 (file)
index 0000000..7332ab5
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_ATIME' => 1556104869,'_SESSION_ID' => 'fee0fa239cfb8d01eb9939433622ac90','alias' => 'admin','_SESSION_ETIME' => 1200,'passw' => '42FAP5H0JUSZM','_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_CTIME' => 1556104820,'database' => 'data_admin_log.db'};;$D
\ No newline at end of file
diff --git a/htdocs/cgi-bin/images/7_Inch_Android_4_0_Tablet_zzMn_tSh.jpg.thumb_70x70.jpg b/htdocs/cgi-bin/images/7_Inch_Android_4_0_Tablet_zzMn_tSh.jpg.thumb_70x70.jpg
new file mode 100644 (file)
index 0000000..7ad0a99
Binary files /dev/null and b/htdocs/cgi-bin/images/7_Inch_Android_4_0_Tablet_zzMn_tSh.jpg.thumb_70x70.jpg differ
diff --git a/htdocs/cgi-bin/images/paw_to_hand_deal_done.jpg b/htdocs/cgi-bin/images/paw_to_hand_deal_done.jpg
new file mode 100644 (file)
index 0000000..85adab3
Binary files /dev/null and b/htdocs/cgi-bin/images/paw_to_hand_deal_done.jpg differ
diff --git a/htdocs/cgi-bin/images/paw_to_hand_deal_done_frm.png b/htdocs/cgi-bin/images/paw_to_hand_deal_done_frm.png
new file mode 100644 (file)
index 0000000..1237e43
Binary files /dev/null and b/htdocs/cgi-bin/images/paw_to_hand_deal_done_frm.png differ
index 596687c6355d48fe2cbdd02b2b80754c78091563..0aab0391dfaccdbd1d8a0111a16d4d29da869367 100755 (executable)
@@ -75,10 +75,10 @@ $session->expire($SESSN_EXPR);
        
 print $cgi->header(-expires=>"0s", -charset=>"UTF-8"); 
 print $cgi->start_html(-title => "Personal Log", -BGCOLOR=>"#c8fff8",
-                                                  -script=>{-type => 'text/javascript',-src => 'wsrc/main.js'},
-                                                                  -style =>{-type => 'text/css', -src => 'wsrc/main.css'},
-                                                                  -onload => "loadedBody('".$toggle."');"
-                       );        
+                       -script=>{-type => 'text/javascript',-src => 'wsrc/main.js'},
+                       -style =>{-type => 'text/css', -src => 'wsrc/main.css'},
+                       -onload => "loadedBody('".$toggle."');"
+            );   
 my $rv;
 my $st;
 my $today = DateTime->now;
@@ -110,7 +110,7 @@ $cats = $cats.'</select>';
 
 my $tbl = qq(<form id="frm_log" action="remove.cgi" onSubmit="return formDelValidation();">
 <table class="tbl" border="0" width="$PRC_WIDTH%">
-<tr class="r0">
+<tr class="hdr">
        <th class="tbl">Date</th>
        <th class="tbl">Time</th>
        <th class="tbl">Log</th><th>#</th>
@@ -182,7 +182,8 @@ if($tbl_start>0){
 #
 #Fetch entries!
 #
-
+my $CID_EVENT = 9;
+my $tags = "";
 $st = $db->prepare( $stmt );
 $rv = $st->execute() or die or die "<p>Error->"& $DBI::errstri &"</p>";
 if($rv < 0) {
@@ -218,31 +219,85 @@ while(my @row = $st->fetchrow_array()) {
                $tfId = 1;
        }
 
-       #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})/<a href="$1" target=_blank>$1<\/a>/gsi;
-       }       
-       $log = join('' , @chnks);
+       if($log =~ /<<IMG</){
+          my $idx = $-[0]+5;
+          my $len = index($log, '>', $idx);
+          my $sub = substr($log,$idx+1,$len-$idx-1);
+          my $url = qq(<img src="$sub."/>");
+                 $tags .= qq(<input id="tag$id" type="hidden" value="$log"/>\n);
+             $log=~s/<<IMG<(.*?)>/$url/osi;              
+       }
+       elsif($log =~ /<<FRM</){
+          my $idx = $-[0]+5;
+          my $len = index($log, '>', $idx);       
+          my $sub = substr($log, $idx+1,$len-$idx-1);
+          my $lnk = $sub;
+          if($lnk =~ /_frm.png/) {                      
+                       my $ext = substr($lnk, index($lnk,'.'));                         
+                          $lnk =~ s/_frm.png/$ext/;
+                       if(not -e  "./images/$lnk"){
+                               $lnk =~ s/$ext/.jpg/;
+                               if(not -e  "./images/$lnk"){
+                                       $lnk =~ s/.jpg/.gif/;
+                               }
+                       }
+                       $lnk = qq(\n<a href="./images/$lnk" style="border=0;" target="_IMG"><img src="./images/$sub" width="210" height="120" class="tag_FRM"/></a>);
+               }else{
+                       #TODO fetch from web locally the original image.
+                       $lnk = qq(\n<img src="$lnk" width="210" height="120" class="tag_FRM"/>);
+               }       
+               $tags .= qq(<input id="tag$id" type="hidden" value="$log"/>\n); 
+           $log=~s/<<FRM<(.*?)>/$lnk/o;
+       }
+       else{
+                       #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})/<a href="$1" target=_blank>$1<\/a>/gsi;
+                       }       
+                       $log = join('' , @chnks);
+       }
+
+       while ($log =~ /<<B</){
+          my $idx = $-[0];
+          my $len = index($log, '>', $idx)-4;
+          my $sub =  "<b>".substr($log,$idx+4,$len-$idx)."</b>";
+             $log=~s/<<B<(.*?)>/$sub/o;        
+       }
+
+
+       while($log =~ /<<TITLE</){
+          my $idx = $-[0];
+          my $len = index($log, '>', $idx)-8;
+          my $sub = "<h3>".substr($log,$idx+8,$len-$idx)."</h3>";
+             $log=~s/<<TITLE<(.*?)>/$sub/o;    
+       }
+
+
        #Decode escaped \\n
        $log =~ s/\\n/<br>/gs;
 
-
-       
-       $tbl .= '<tr class="r'.$tfId.'">
-                <td id="y'.$id.'" width="10%">'.$dt->ymd."</td>\n". 
-               '<td id="t'.$id.'" width="10%" class="tbl">'.$dt->hms."</td>\n".
-               '<td id="v'.$id.'" class="log">' . $log . "</td>\n".
-               '<td id="a'.$id.'" width="10%" class="tbl">' . $amm ."</td>\n".
-               '<td id="c'.$id.'" width="10%" class="tbl">' . $ct ."</td>\n".
-               '<td width="110px;">
-                       <input class="edit" type="button" value="Edit" onclick="return edit('.$id.');"/>
-                       <input name="chk" type="checkbox" value="'.$id.'"/>
+       if($CID_EVENT == $row[1]){
+               $log = "<font color='#eb4848' style='font-weight:bold'>$log</font>";
+       }elsif(1 == $row[1]){
+               $log = "<font color='midnightblue' style='font-weight:bold;font-style:italic'>$log</font>";
+       }
+       my $dty=$dt->ymd;
+       my $dth=$dt->hms;
+       $tbl .= qq(<tr class="r$tfId">
+               <td id="y$id" width="10%">$dty</td>
+               <td id="t$id" width="10%" class="tbl">$dth</td>
+               <td id="v$id" class="log">$log</td>
+               <td id="a$id" width="10%" class="tbl">$amm</td>
+               <td id="c$id" width="10%" class="tbl">$ct</td>
+               <td width="110px;">
+                       <input class="edit" type="button" value="Edit" onclick="return edit($id);"/>
+                       <input name="chk" type="checkbox" value="$id"/>
                </td>
-       </tr>';
-       $tbl_rc += 1;     
+       </tr>);
+       $tbl_rc += 1;
 
        if($REC_LIMIT>0 && $tbl_rc==$REC_LIMIT){
 
@@ -307,7 +362,7 @@ my $frm = qq(<a name="top"></a>
                        </td>
        <td></td>
        </tr>
-               <tr><td style="text-align:right">Log:</td>
+       <tr><td style="text-align:right">Log:</td>
                <td id="al"><textarea id="el" name="log" rows="2" cols="80"></textarea></td>
                <td>Category:&nbsp;$cats</td></tr>
                <tr><td style="text-align:right"><a href="#bottom">&#x21A1;</a>&nbsp;Ammount:</td>
@@ -317,14 +372,17 @@ my $frm = qq(<a name="top"></a>
                                                        style="float: right;">Show Search</button>
                </td>
                <td align="right"><input id="log_submit" type="submit" value="Submit"/>
-               </td>
-</tr></table>
+               </td>           
+       </tr>
+       <tr><td colspan="3"></td></tr>
+       </table>
        <input type="hidden" name="submit_is_edit" id="submit_is_edit" value="0"/>
        <input type="hidden" name="submit_is_view" id="submit_is_view" value="0"/>
        <input type="hidden" name="rs_all" value="0"/>
        <input type="hidden" name="rs_cur" value="0"/>
        <input type="hidden" name="rs_prev" value="$tbl_rc_prev"/>
        <input type="hidden" name="CGISESSID" value="$sid"/>
+       $tags   
        </form>
        );
 
index 837e13e50c2b051c03cbd7e3737daa77c1f9b7ca..0a961f16d49e661589062d094be05676eda741d5 100644 (file)
@@ -6,21 +6,44 @@
 use strict;
 use warnings;
 
-our $LOG_PATH    = '/home/will/dev/LifeLog/dbLifeLog/';
+use LWP::UserAgent;
+use File::Basename;
 
-&removeOldSessions;
+my $lwp = LWP::UserAgent->new(agent=>' Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Firefox/24.0', cookie_jar=>{});
 
-sub removeOldSessions{
-       opendir(DIR, $LOG_PATH);
-       my @files = grep(/cgisess_*/,readdir(DIR));
-       closedir(DIR);
+my $link = 'http://cdn.chv.me/images/thumbnails/7_Inch_Android_4_0_Tablet_zzMn_tSh.jpg.thumb_70x70.jpg';
+my $file = fileparse $link;
 
-       my $now = time - (24 * 60 * 60);
+my $resp = $lwp->mirror($link, "/home/will/dev/LifeLog/htdocs/cgi-bin/images/$file");
 
-       foreach my $file (@files) {
-               my $mod = (stat("$LOG_PATH/$file"))[9];
-               if($mod<$now){
-                   print "$file\n";
-               }
+unless($resp->is_success) {
+    print $resp->status_line;
+}
+
+#my $log ="Kurac palac deci davac. <<FRM<paw_<<B<Agreement> reached.\n";
+my $log =
+"Test <run></run><<IMG<Agreement> reached.<<B<errfrffff>\n";
+
+=comment
+       if($log =~ /<<IMG</){
+          my $idx = $-[0]+5;
+          my $len = index($log, '>', $idx);
+          my $sub = substr($log,$idx+1,$len-$idx-1);
+          my $url = qq(<img src="$sub"/>");
+                 #$tags .= qq(<input id="tag$id" type="hidden" value="$log"/>\n);
+             $log=~s/<<IMG<(.*?)>/$url/o;                
        }
-}
\ No newline at end of file
+
+
+if($log =~ /<<TITLE</){
+          my $idx = $-[0];
+          my $len = index($log, '>', $idx)-8;
+          my $sub =  "<h3>".substr($log,$idx+8,$len-$idx)."</h3>";
+             $log=~s/<<TITLE<(.*)>/$sub/gsi;
+                 $log=~s/<<FRM<//gsi;
+}
+print $log;
+
+<<IMG<https://cdn.images.express.co.uk/img/dynamic/128/590x/secondary/Cute-puppy-pictures-science-why-adorable-puppies-1355345.jpg>
+My name is Cutie!
+=cut
\ No newline at end of file
index 4a6293f8460949ee27d5bfb25abe87328f2bd2ff..94366f27f37120a9da6d2d6a0dbeb1daff52c0b3 100644 (file)
@@ -31,6 +31,7 @@ div {
     padding-right: 5px;
     padding-bottom: 5px;
     padding-left: 5px;
+    margin-bottom: 0px;
 }
 
 .tbl_rem {
@@ -48,18 +49,31 @@ div {
     background-color: #e6ffff;
     border: 1px solid black;
     border-right: 1px solid black;
+    vertical-align: top;
 }
 
 .r1 {
     background-color: #ccffff;
     border: 1px solid black;
     border-right: 1px solid black;
+    vertical-align: top;
+}
+
+.hdr {
+    font-style: normal;
+    font-weight: bold;
+    font-size: large;
+    background-color: rgb(148, 205, 231);
+    border: 1px solid black;
+    border-right: 1px solid black;
+    text-align: center;
 }
 
 .edit {
     margin: 2px;
     padding: 2px;
     font-size: 9pt;
+    color: midnightblue
 }
 
 #al {
@@ -96,4 +110,16 @@ div#rz {
     height: auto;
     padding: 2%;
     margin: 0px auto;
+}
+
+#tag_FRM {
+    border: 2px solid rgb(148, 205, 231);
+    padding: 5px;
+    text-align: right;
+    vertical-align: top;
+}
+
+img {
+    float: left;
+    padding: 0 10px
 }
\ No newline at end of file
index 5b49fab5cbffc47cbf77fb1e815ce96ff7afe48d..9accd3a24bc9e04a220e41073eb3e1d0eb00c57a 100644 (file)
  Open Source License -> https://choosealicense.com/licenses/isc/
 */
 
-function loadedBody(toggle){
-       var el = document.getElementById("frm_entry");
-       el.log.focus();
-       if(toggle){
-               toggleSearch(document.getElementById("btn_srch"));
-       }
+function loadedBody(toggle) {
+    var el = document.getElementById("frm_entry");
+    el.log.focus();
+    if (toggle) {
+        toggleSearch(document.getElementById("btn_srch"));
+    }
 
-       document.getElementById("log_submit").addEventListener("click", encodeText);
+    document.getElementById("log_submit").addEventListener("click", encodeText);
 }
 
-function encodeText(el){
-       var el = document.getElementById("frm_entry");
-       var txt = el.log.value;
-       txt = txt.replace(/\r\n/g, "\\n");
-       txt = txt.replace(/\n/g, "\\n");
-       el.log.value = txt;
+function encodeText(el) {
+    var el = document.getElementById("frm_entry");
+    var txt = el.log.value;
+    txt = txt.replace(/\r\n/g, "\\n");
+    txt = txt.replace(/\n/g, "\\n");
+    el.log.value = txt;
 }
 
 
-function formValidation(){
-  
-var date = document.getElementById("frm_entry").date;
-var log  = document.getElementById("frm_entry").log;
-var cat  = document.getElementById("frm_entry").cat;
-if(cat.value ==0){
-       alert("Category -> has not been selected!");
-       return false;
-}
+function formValidation() {
+
+    var date = document.getElementById("frm_entry").date;
+    var log = document.getElementById("frm_entry").log;
+    var cat = document.getElementById("frm_entry").cat;
+    if (cat.value == 0) {
+        alert("Category -> has not been selected!");
+        return false;
+    }
 
-return validDate(date.value) && validLog(log.value);
+    return validDate(date.value) && validLog(log.value);
 
 }
 
-function validDate(dt){
-       if(!Date.parse(dt)){
-               alert("Date -> '" + dt +"' is Invalid can't submit!");
-               return false;
-       }
-return true;
+function validDate(dt) {
+    if (!Date.parse(dt)) {
+        alert("Date -> '" + dt + "' is Invalid can't submit!");
+        return false;
+    }
+    return true;
 }
 
-function validLog(log){
-       if(log==""){
+function validLog(log) {
+    if (log == "") {
 
-               alert("Log -> entry can't be empty, can't submit!");
-               return false;
-       }
-return true;
+        alert("Log -> entry can't be empty, can't submit!");
+        return false;
+    }
+    return true;
 }
 
 
-function setNow(){
+function setNow() {
 
-       var date = document.getElementById("frm_entry").date;
-       var dt = new Date();
-       var mm = fix0(dt.getMonth()+1);
-       var dd = fix0(dt.getDate()); 
-       date.value = dt.getFullYear()+"-"+mm+"-"+dd+ " " + 
-       fix0(dt.getHours()) + ":" + fix0(dt.getMinutes()) +":"+ fix0(dt.getSeconds());
-return false;
+    var date = document.getElementById("frm_entry").date;
+    var dt = new Date();
+    var mm = fix0(dt.getMonth() + 1);
+    var dd = fix0(dt.getDate());
+    date.value = dt.getFullYear() + "-" + mm + "-" + dd + " " +
+        fix0(dt.getHours()) + ":" + fix0(dt.getMinutes()) + ":" + fix0(dt.getSeconds());
+    return false;
 }
 
-function fix0(v){
-       if(v<10){
-               return "0"+v;
-       }
-       return v;
+function fix0(v) {
+    if (v < 10) {
+        return "0" + v;
+    }
+    return v;
 }
 
-function edit(row){
-
-       var ec_v = document.getElementById("c"+ row).innerText;
-       var ec   = document.getElementById("ec");
+function edit(row) {
 
-       var ed_v = document.getElementById("y"+ row); 
-       var et_v   = document.getElementById("t"+ row); 
-       var ev_v = document.getElementById("v"+ row); 
-       var ea_v = document.getElementById("a"+ row); 
+    var ec_v = document.getElementById("c" + row).innerText;
+    var ec = document.getElementById("ec");
 
-       
-       document.getElementById("el").value = ev_v.innerText;
-       document.getElementById("ed").value = ed_v.innerText + " " +  et_v.innerText;
-       document.getElementById("am").value = ea_v.innerText;
-       //Change selected catergory
-       for(var i = 0, j = ec.options.length; i < j; ++i) {
-               if(ec.options[i].innerHTML === ec_v) {
-                                  ec.selectedIndex = i;
-                                  break;
-                }
-       }
-       document.getElementById("submit_is_edit").value = row;
-       document.getElementById("frm_entry").log.focus();
+    var ed_v = document.getElementById("y" + row);
+    var et_v = document.getElementById("t" + row);
+    var ev_v = document.getElementById("v" + row);
+    var ea_v = document.getElementById("a" + row);
+    var etag = document.getElementById("tag" + row);
+    if (etag) {
+        var v = etag.value;
+        v = v.replace(/\\n/g, '\n');
+        document.getElementById("el").value = v;
+    } else {
+        document.getElementById("el").value = ev_v.innerText;
+    }
+    document.getElementById("ed").value = ed_v.innerText + " " + et_v.innerText;
+    document.getElementById("am").value = ea_v.innerText;
+    //Change selected catergory
+    for (var i = 0, j = ec.options.length; i < j; ++i) {
+        if (ec.options[i].innerHTML === ec_v) {
+            ec.selectedIndex = i;
+            break;
+        }
+    }
+    document.getElementById("submit_is_edit").value = row;
+    document.getElementById("frm_entry").log.focus();
 
-return false;
+    return false;
 }
 
 
 
-function selectAllLogs(){
-       var frm = document.getElementById("frm_log");
-       var chks = document.getElementsByName("chk");
-       for(var i=0, n=chks.length;i<n;i++) {
-                     chks[i].checked = true;
-        }
-return false;
+function selectAllLogs() {
+    var frm = document.getElementById("frm_log");
+    var chks = document.getElementsByName("chk");
+    for (var i = 0, n = chks.length; i < n; i++) {
+        chks[i].checked = true;
+    }
+    return false;
 }
 
 
-function submitNext(tbl_rc){
+function submitNext(tbl_rc) {
 
-       var frm = document.getElementById("frm_entry");
-           frm.submit_is_view.value = 1;
-           frm.rs_all.value = 0;
-           frm.rs_cur.value = tbl_rc;
-           frm.submit_is_view.value = 1;
-           frm.submit();
+    var frm = document.getElementById("frm_entry");
+    frm.submit_is_view.value = 1;
+    frm.rs_all.value = 0;
+    frm.rs_cur.value = tbl_rc;
+    frm.submit_is_view.value = 1;
+    frm.submit();
 
-       return false;
+    return false;
 }
 
-function submitPrev(tbl_rc){
+function submitPrev(tbl_rc) {
 
-       var frm = document.getElementById("frm_entry");
-           frm.submit_is_view.value = 1;
-           frm.rs_all.value = 0;
-           frm.rs_cur.value = tbl_rc;
-           frm.rs_prev.value = tbl_rc;
-           frm.submit_is_view.value = 1;
-           frm.submit();
+    var frm = document.getElementById("frm_entry");
+    frm.submit_is_view.value = 1;
+    frm.rs_all.value = 0;
+    frm.rs_cur.value = tbl_rc;
+    frm.rs_prev.value = tbl_rc;
+    frm.submit_is_view.value = 1;
+    frm.submit();
 
-       return false;
+    return false;
 }
 
-function viewAll(){
+function viewAll() {
 
-       var frm = document.getElementById("frm_entry");
-           frm.submit_is_view.value = 1;
-           frm.rs_all.value = 1;
-           frm.rs_cur.value = 0;
-           frm.rs_prev.value = 0;
-           frm.submit_is_view.value = 1;
-           frm.submit();
+    var frm = document.getElementById("frm_entry");
+    frm.submit_is_view.value = 1;
+    frm.rs_all.value = 1;
+    frm.rs_cur.value = 0;
+    frm.rs_prev.value = 0;
+    frm.submit_is_view.value = 1;
+    frm.submit();
 
-       return false;
+    return false;
 }
 
 
 function toggleSearch(btn) {
 
-           var d = document.getElementById("div_srh");
-           if (d.style.display === "none" || d.style.display ==="") {
-                 d.style.display = "block";
-                 btn.innerText="Hide Search";
-          } else {
-                 d.style.display = "none";
-                 btn.innerText="Show Search";
-          }
+    var d = document.getElementById("div_srh");
+    if (d.style.display === "none" || d.style.display === "") {
+        d.style.display = "block";
+        btn.innerText = "Hide Search";
+    } else {
+        d.style.display = "none";
+        btn.innerText = "Show Search";
+    }
 }
 
-function resetView(){
-               
-           var f = document.getElementById("frm_srch");
-           f.keywords.value = "";
+function resetView() {
+
+    var f = document.getElementById("frm_srch");
+    f.keywords.value = "";
 }
 
-function updateSelCategory(sel){
-//disabled as Search View has own dreopdown since v.1.3         
-//    var b = document.getElementById("btn_cat");
+function updateSelCategory(sel) {
+    //disabled as Search View has own dreopdown since v.1.3     
+    //    var b = document.getElementById("btn_cat");
     var cat = document.getElementById("idx_cat");
     cat.value = sel.options[sel.selectedIndex].value;
-//    b.innerText = sel.options[sel.selectedIndex].text;
-       
-//    document.getElementById("ctmsg").style.display = "none";    
-}
+    //    b.innerText = sel.options[sel.selectedIndex].text;
 
-function viewByCategory(btn){
-        
-    document.getElementById("rs_keys").value = "";    
+    //    document.getElementById("ctmsg").style.display = "none";    
 }
 
-function viewByDate(btn){
-//     alert(btn.value);
+function viewByCategory(btn) {
+
+    document.getElementById("rs_keys").value = "";
 }
 
-function submitNewCategory(){
-       
-       var frm = document.getElementById("frm_config");
-       var cid = frm.caid;
-           frm.cchg.value = cid.value;
-  return true;
+function viewByDate(btn) {
+    // alert(btn.value);
 }
 
-function dateDiffSelected(){
- document.getElementById("datediff").value = 1;
-  return true;
+function submitNewCategory() {
+
+    var frm = document.getElementById("frm_config");
+    var cid = frm.caid;
+    frm.cchg.value = cid.value;
+    return true;
 }
+
+function dateDiffSelected() {
+    document.getElementById("datediff").value = 1;
+    return true;
+}
\ No newline at end of file
index ec131830919b51733c2e0d79cfe9eaf5e606f9ab..95043c07da57b7c29cde528331207765dd420570 100644 (file)
@@ -1 +1 @@
-5885
+5440