From: Metabox Date: Sat, 27 Apr 2019 03:05:36 +0000 (+1000) Subject: L-Tags help specs added on config page. X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=db2adc9588e149e2815e3e28780dd3a47a03d64a;p=LifeLog.git L-Tags help specs added on config page. --- diff --git a/.vstags b/.vstags index 1ce5995..b41586d 100644 --- a/.vstags +++ b/.vstags @@ -7,21 +7,21 @@ ConfirmedDelition htdocs/cgi-bin/remove.cgi 150;" s DisplayDateDiffs htdocs/cgi-bin/remove.cgi 103;" s NotConfirmed htdocs/cgi-bin/remove.cgi 170;" s -authenticate htdocs/cgi-bin/main.cgi 587;" s +authenticate htdocs/cgi-bin/main.cgi 608;" s big_money htdocs/cgi-bin/stats.cgi 126;" s boldDate htdocs/cgi-bin/remove.cgi 144;" s build htdocs/cgi-bin/search.cgi 85;" s -buildNavigationButtons htdocs/cgi-bin/main.cgi 543;" s -changeSystemSettings htdocs/cgi-bin/config.cgi 330;" s +buildNavigationButtons htdocs/cgi-bin/main.cgi 564;" s +changeSystemSettings htdocs/cgi-bin/config.cgi 366;" s checkCreateTables htdocs/cgi-bin/login_ctr.cgi 113;" s dateDiff htdocs/cgi-bin/remove.cgi 136;" s -exportCategoriesToCSV htdocs/cgi-bin/config.cgi 397;" s -exportLogToCSV htdocs/cgi-bin/config.cgi 366;" s -getConfiguration htdocs/cgi-bin/config.cgi 526;" s -getConfiguration htdocs/cgi-bin/main.cgi 630;" s +exportCategoriesToCSV htdocs/cgi-bin/config.cgi 433;" s +exportLogToCSV htdocs/cgi-bin/config.cgi 402;" s +getConfiguration htdocs/cgi-bin/config.cgi 562;" s +getConfiguration htdocs/cgi-bin/main.cgi 655;" s getConfiguration htdocs/cgi-bin/remove.cgi 228;" s -importCatCSV htdocs/cgi-bin/config.cgi 429;" s -importLogCSV htdocs/cgi-bin/config.cgi 470;" s +importCatCSV htdocs/cgi-bin/config.cgi 465;" s +importLogCSV htdocs/cgi-bin/config.cgi 506;" s insertDefCats htdocs/cgi-bin/login_ctr.cgi 254;" s main htdocs/cgi-bin/login_ctr.cgi 6;" p main::checkCreateTables htdocs/cgi-bin/login_ctr.cgi 113;" s @@ -30,15 +30,15 @@ main::populateConfig htdocs/cgi-bin/login_ctr.cgi 203;" s main::processSubmit htdocs/cgi-bin/login_ctr.cgi 87;" s main::removeOldSessions htdocs/cgi-bin/login_ctr.cgi 270;" s main::selSQLTbl htdocs/cgi-bin/login_ctr.cgi 249;" s -parseDate htdocs/cgi-bin/main.cgi 444;" s +parseDate htdocs/cgi-bin/main.cgi 465;" s populateConfig htdocs/cgi-bin/login_ctr.cgi 203;" s -processSubmit htdocs/cgi-bin/config.cgi 225;" s +processSubmit htdocs/cgi-bin/config.cgi 261;" s processSubmit htdocs/cgi-bin/login_ctr.cgi 87;" s -processSubmit htdocs/cgi-bin/main.cgi 458;" s +processSubmit htdocs/cgi-bin/main.cgi 479;" s removeOldSessions htdocs/cgi-bin/login_ctr.cgi 270;" s selSQLTbl htdocs/cgi-bin/login_ctr.cgi 249;" s selectSQL htdocs/cgi-bin/stats.cgi 115;" s -updConfSetting htdocs/cgi-bin/config.cgi 353;" s -updateCATDB htdocs/cgi-bin/config.cgi 443;" s -updateLOGDB htdocs/cgi-bin/config.cgi 486;" s +updConfSetting htdocs/cgi-bin/config.cgi 389;" s +updateCATDB htdocs/cgi-bin/config.cgi 479;" s +updateLOGDB htdocs/cgi-bin/config.cgi 522;" s wanted htdocs/cgi-bin/e_vars.pl 211;" s diff --git a/dbLifeLog/cgisess_8fcc7f435d33c50c6099f5e6eb67e6ff b/dbLifeLog/cgisess_8fcc7f435d33c50c6099f5e6eb67e6ff new file mode 100644 index 0000000..e4267c6 --- /dev/null +++ b/dbLifeLog/cgisess_8fcc7f435d33c50c6099f5e6eb67e6ff @@ -0,0 +1 @@ +$D = {'_SESSION_ID' => '8fcc7f435d33c50c6099f5e6eb67e6ff','_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_CTIME' => 1556331290,'_SESSION_ATIME' => 1556334218,'_SESSION_ETIME' => 1800,'database' => 'data_admin_log.db','alias' => 'admin','passw' => '42FAP5H0JUSZM'};;$D \ No newline at end of file diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi index d97705b..bca2528 100755 --- a/htdocs/cgi-bin/config.cgi +++ b/htdocs/cgi-bin/config.cgi @@ -189,8 +189,10 @@ my $prc_hdr = $PRC_WIDTH-2; print "\n
\n" . $frmVars."\n
\n"; print "\n
\nSTATUS:" .$status. "\n
\n"; print qq( -
Back to Main Log

\n - +
+

Back to Main Log


\n + +
\n \n \n \n -

CSV File Format

\n @@ -205,13 +207,47 @@ my $prc_hdr = $PRC_WIDTH-2;

To Server -> $sys -> $dbname

- - + + +
↟   [Export Log to CSV]   [View the Log in CSV Format]
\n
[Export Categories to CSV]   - [View the Categories in CSV Format]
\n + [View the Categories in CSV Format]\n +
+ +
+
+

E-Tags Specs

+

+ <<B<{Text To Bold}> +

+

+ <<TITLE<{Title Text}> +

+

+ <<IMG<{url to image}> +

+

+ <<FRM<{file name}_frm.png}>

+ *_frm.png images file pairs are located in the ./images folder of the cgi-bin directory.
+ These are manually resized by the user. Next to the original. + Otherwise considered as stand alone icons. *_frm.png Image resized to -> width="210" height="120" +
Example: + 

+		../cgi-bin/images/
+			my_cat_simon_frm.png
+			my_cat_simon.jpg															 
+
In loge entry, place: + 
+	<<FRM>my_cat_simon_frm.png> <<TITLE<Simon The Cat>
+	This is my pet, can you hold him for a week while I am on holiday?
+
+

Log Page Particulars

+ ↟ or ↡ - Jump links to top or bottom of page respectivelly. +

+
+
); diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi index b4ea4b8..9f63156 100755 --- a/htdocs/cgi-bin/main.cgi +++ b/htdocs/cgi-bin/main.cgi @@ -30,7 +30,7 @@ our $LOG_PATH = '../../dbLifeLog/'; our $SESSN_EXPR = '+30m'; our $DATE_UNI = '0'; our $RELEASE_VER = '1.3'; -our $AUTHORITY = 'admin'; +our $AUTHORITY = ''; #END OF SETTINGS my $cgi = CGI->new; @@ -258,7 +258,8 @@ while(my @row = $st->fetchrow_array()) { $lnk =~ s/.jpg/.gif/; } } - $lnk = qq(\n); + $lnk = qq(\n + ); }else{ #TODO fetch from web locally the original image. $lnk = qq(\n); @@ -266,7 +267,7 @@ while(my @row = $st->fetchrow_array()) { $tags .= qq(\n); $log=~s/</$lnk/o; } - else{ + #Replace with a full link an HTTP URI my @chnks = split(/($re_a_tag)/si , $log) ; foreach my $ch_i ( @chnks ) { @@ -275,7 +276,7 @@ while(my @row = $st->fetchrow_array()) { $ch_i =~ s/($RE{URI}{HTTP})/$1<\/a>/gsi; } $log = join('' , @chnks); - } + while ($log =~ /<