From: wbudic <redacted>
Date: Thu, 2 Sep 2021 06:35:45 +0000 (+1000)
Subject: Bug 63.1 fixed.
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=ea0fff37bee151c4cceecb19ba6bdc60fc24b556;p=LifeLog.git

Bug 63.1 fixed.
---

diff --git a/Current Development Check List.md b/Current Development Check List.md
index eb6dd21..9eb5e39 100644
--- a/Current Development Check List.md	
+++ b/Current Development Check List.md	
@@ -231,6 +231,7 @@ between 2018-08-22 04:13:55 **Moon Stable** production release and this
 
 ### v. 2.3+ Encountered/Fixed
 
+* &#10004; Bug 36.1, Introduced bug, old backup delete not working.
 * &#10004; Bug 36, DBFix not fully working on PG based install and restore not working from backups made with older versions of OpenSSL.
   * Also, restore not working on uploaded backups, from local computer.
   
diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi
index 5aa386b..64c0dac 100755
--- a/htdocs/cgi-bin/config.cgi
+++ b/htdocs/cgi-bin/config.cgi
@@ -48,12 +48,12 @@ my $CID     = 'rowid'; $CID = 'ID' if Settings::isProgressDB();
 
 exportToCSV() if ($csvp);
 
-if($cgi->param('bck'))        {&backup}
-elsif($cgi->param('bck_del')) {&backupDelete}
-elsif($cgi->param('data_bck')){&restore;}
-elsif($cgi->param('bck_file')){restore($cgi->param('bck_file'))}
-elsif($cgi->param('data_cat')){&importCatCSV}
-elsif($cgi->param('data_log')){&importLogCSV}
+if($cgi->param('bck'))            {&backup}
+elsif($_=$cgi->param('bck_del'))  {backupDelete($_)}
+elsif($cgi->param('data_bck'))    {&restore;}
+elsif($_=$cgi->param('bck_file')) {restore($_)}
+elsif($cgi->param('data_cat'))    {&importCatCSV}
+elsif($cgi->param('data_log'))    {&importLogCSV}
 
 
 
@@ -411,15 +411,13 @@ print qq(
     <div id="rz" style="text-align:left; width:640px; padding:10px; background-color:).&Settings::bgcol.qq(">            
             <table border="0" width="100%">
 
-                <form id="bck" action="config.cgi" method="post">
+                
                 <tr><td><a name="backup"></a><H3>Backup File Format</H3></td></tr>
                 <tr><td><input id="btnFetch" type="button" onclick="alert('Backing up next, this can take up some time. Please give it few minutes and return or refresh the config page!');return fetchBackup();" value="Fetch"/><hr></td></tr>
 
-                <tr><td><div id="div_backups">$bck_list</div><hr></td></tr>
-                </form>
+                <tr><td><div id="div_backups"><form id="frm_bck" action="config.cgi" method="post">$bck_list</form></div><hr></td></tr>                
 
-                <tr><td>
-                        <form id="bck_file" action="config.cgi" method="post" enctype="multipart/form-data">
+                <tr><td><form id="frm_restore" action="config.cgi" method="post" enctype="multipart/form-data">
                         $inpRestore
                         </form>
                 <hr></td></tr>
@@ -1133,7 +1131,7 @@ try{
 }
 
 sub backupDelete {
-    my $n = $cgi->param('bck_del');
+    my $n = shift;
     my $f = &Settings::logPath.$n;
 try{
     if (-e $f) {
diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js
index 3ccb39f..b3c3213 100644
--- a/htdocs/cgi-bin/wsrc/main.js
+++ b/htdocs/cgi-bin/wsrc/main.js
@@ -1322,7 +1322,7 @@ function deleteBackup() {
         show: { effect: "clip", duration: 1000 },
         hide: { effect: "explode", duration: 1000},
         open: function() {
-            var sel = $("#bck input[type=radio]:checked").val();
+            var sel = $("#frm_bck input[type=radio]:checked").val();
           $(this).html("Are you sure you want to delete file:<br><b>"+sel+"</b>");
         },
         buttons: [
@@ -1330,7 +1330,7 @@ function deleteBackup() {
                 icon: "ui-icon-trash",
                 click: function() {
                   $( this ).dialog( "close" );
-                    var sel = $( "#bck input[type=radio]:checked").val();
+                    var sel = $( "#frm_bck input[type=radio]:checked").val();
                     window.location = "config.cgi?bck_del="+sel+"#backup";
                 }
               },