From 22e47657adc3cd7323e7356d0c69c8cfa6890663 Mon Sep 17 00:00:00 2001
From: Will Budicm <vilijanac@gmail.com>
Date: Sun, 30 Aug 2020 11:16:03 +1000
Subject: [PATCH] Tested RTF based view of entries.

---
 Current Development Check List.md | 4 ++--
 htdocs/cgi-bin/main.cgi           | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Current Development Check List.md b/Current Development Check List.md
index b5a1d49..667b564 100644
--- a/Current Development Check List.md	
+++ b/Current Development Check List.md	
@@ -8,12 +8,12 @@ This version is not compatible in data structure to prior versions. Data migrati
 
 ### v.2.0 SUN RC2 Encountered
 
-* -> RTF based view of log entries.
-* Check and test cross relese migration.
 * Export to CVS button on selected logs.
 * Multiple search views and their settings, should be preserved as last preset. Maybe even have name multiple ones in a dropdown.
 * Multiple category assignment to be enabled, where the first selected is the primary, others put in separate cross reference table.
 * Sub users list with passwords in config to be provided, with access and category, permissions settings. Default enabled permission is Event view category.
+* &#10004; RTF based view of log entries.
+* &#10004; Check and test cross release migration.
 * &#10004; Minimise Log form when in View Mode.
 * &#10004; Restore of backup on different version of LifeLog should fail with detecting this in provided error.
   * Provided Backup/Restore Specifications, and message that restoration has been invalidated as that is an invalid backup file.
diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 7a818ac..182590b 100755
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -272,7 +272,7 @@ qq(<FORM id="frm_log" action="data.cgi" onSubmit="return formDelValidation();">
     #We use js+perl, trickery to filter by amount type, as well.
     if ($prm_aa >0){my $s = $prm_aa - 1;$prm_aa = " AFLAG=$s AND";}else{$prm_aa=""}
 
-    $stmS .= " ID_RTF>0 AND" if($prm_rtf==1);
+    $stmS .= " ID_RTF>0 AND" if($prm_rtf);
 
     if ( $rs_keys && $rs_keys ne '*' ) {
 
@@ -360,6 +360,10 @@ qq(<FORM id="frm_log" action="data.cgi" onSubmit="return formDelValidation();">
                     $prm_aa =~ s/AND$//g;
                     $sqlVWL = $stmS .$prm_aa.' '.$stmE;
         }
+        elsif($prm_rtf){
+             $stmS   =~ s/AND$//g;
+             $sqlVWL = $stmS.$stmE;
+        }
     }
 
 
@@ -374,7 +378,7 @@ qq(<FORM id="frm_log" action="data.cgi" onSubmit="return formDelValidation();">
     my $re_a_tag  = qr/<a\s+.*?>.*<\/a>/si;
     my $isInViewMode = rindex ($sqlVWL, 'PID<=') > 0 || rindex ($sqlVWL, 'ID_CAT=') > 0 || $prm_aa || rindex ($sqlVWL, 'REGEXP')>0 || $prm_rtf;
 
-    toBuf $cgi->pre("###[Session PARAMS->isV:$isInViewMode|vc=$prm_vc|xc=$prm_xc|aa: $prm_aa|xc_lst=$prm_xc_lst|\@xc_lst=@xc_lst|keepExcludes=".&Settings::keepExcludes."] -> ".$sqlVWL) if $DEBUG;
+    toBuf $cgi->pre("###[Session PARAMS->isV:$isInViewMode|vc=$prm_vc|xc=$prm_xc|aa: $prm_aa|xc_lst=$prm_xc_lst|\@xc_lst=@xc_lst|vrtf=$prm_rtf|keepExcludes=".&Settings::keepExcludes."] -> ".$sqlVWL) if $DEBUG;
 
     if ( $log_start > 0 ) {
 
-- 
2.34.1