bug 5

diff --git a/htdocs/cgi-bin/login_ctr.cgi b/htdocs/cgi-bin/login_ctr.cgi
index e7de7466253e35b659b18d675cd539e43bca84da..7ff575888d20a94d8aab98867e4455698a77c295 100755 (executable)
--- a/htdocs/cgi-bin/login_ctr.cgi
+++ b/htdocs/cgi-bin/login_ctr.cgi
@@ -148,6 +148,7 @@ try{
                                                 $alias = $cre[0];
                                                 $passw = $cre[1];                                               
                                        }
+                        $db->disconnect();
                }
 }
  catch{                
@@ -249,15 +250,15 @@ try{
        $st = $db->prepare(selSQLTbl('NOTES'));
        $st->execute();
        if(!$st->fetchrow_array()) {
-    my $stmt = qq(
-                                                                                                                                                                               CREATE VIRTUAL TABLE NOTES USING fts4(
-                                                                                                                                                                                               ID INT PRIMARY KEY NOT NULL,
-                                                                                                                                                                                               ID_LOG INT,
-                                                                                                                                                                                               AUTHOR,
-                                                                                                                                                                                               CONTENT TEXT NOT NULL,
-                                                                                                                                                                                               compress=zip, uncompress=unzip
-                                                                                                                                                                               );
-               ); 
+my $stmt = qq(
+                                                                               CREATE VIRTUAL TABLE NOTES USING fts4(
+                                                                                               ID INT PRIMARY KEY NOT NULL,
+                                                                                               ID_LOG INT,
+                                                                                               AUTHOR,
+                                                                                               CONTENT TEXT NOT NULL,
+                                                                                               compress=zip, uncompress=unzip
+                                                                               );
+); 
                $rv = $db->do($stmt);
                if($rv < 0){print "<p>Error->"& $DBI::errstri &"</p>"};
                $st = $db->prepare("SELECT * FROM AUTH WHERE alias='$alias' AND passw='$passw';");
@@ -332,6 +333,7 @@ try{
          
                my $insConfig = $db->prepare('INSERT INTO CONFIG VALUES (?,?,?,?)');
                my $insCat    = $db->prepare('INSERT INTO CAT VALUES (?,?,?)');
+                                               $db->begin_work();
     foreach my $line (@lines) {
                                        
                                        my @tick = split("`",$line);
@@ -397,10 +399,11 @@ $err .= "Invalid, spec'ed {uid}|{category}`{description}-> $line\n";
                                        }
                }    
                die "Configuration script $LOG_PATH.'main.cnf' [$fh] contains errors." if $err;
+               $db->commit();
        } catch{                        
          print $cgi->header;
-               print "<font color=red><b>SERVER ERROR!</b></font><br> ".$_."<br><pre>$err</pre>";
-    print $cgi->end_html;
+         print "<font color=red><b>SERVER ERROR!</b></font><br> ".$_."<br><pre>$err</pre>";
+         print $cgi->end_html;
                exit;
  }
 }
@@ -413,6 +416,7 @@ return "SELECT name FROM sqlite_master WHERE type='table' AND name='$name';"
 sub insertDefCats {
          my
          $st = $_[0]->prepare('INSERT INTO CAT VALUES (?,?,?)'); 
+                       $_[0]->begin_work();
                $st->execute(1, "Unspecified", "For quick uncategorised entries.");
                $st->execute(3, "File", "Operating file system short log.");
                $st->execute(6, "System Log", "Operating system important log.");
@@ -422,6 +426,7 @@ sub insertDefCats {
                $st->execute(35,"Income", "Significant yearly income.");
                $st->execute(40,"Work", "Work related entry, worth monitoring.");
                $st->execute(45,"Food", "Quick reference to recepies, observations.");
+               $_[0]->commit();
                $st->finish();
 }
 

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index d8053bb400a729f555d77015a2491233f8431dc6..10dbe0a7095c720cfe5f60c07585164d3e72e5a2 100755 (executable)
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -373,8 +373,7 @@ while ( my @row = $st->fetchrow_array() ) {
           }
           else {
               #TODO fetch from web locally the original image.
-              $lnk =
-qq(\n<img src="$lnk" width="$imgw" height="$imgh" class="tag_FRM"/>);
+              $lnk=qq(\n<img src="$lnk" width="$imgw" height="$imgh" class="tag_FRM"/>);
           }
           if ( !$tagged ) {
               $tags .= qq(<input id="tag$id" type="hidden" value="$log"/>\n);
@@ -412,7 +411,8 @@ qq(\n<img src="$lnk" width="$imgw" height="$imgh" class="tag_FRM"/>);
       }
 
       #Decode escaped \\n
-      $log =~ s/\\n/<br>/gs;
+      $log =~ s/\r\n/<br>/gs;
+      $log =~ s/\n/<br>/gs;
 
       if ( $CID_EVENT == $row[1] ) {
           $log = "<font color='#eb4848' style='font-weight:bold'>$log</font>";
@@ -654,7 +654,7 @@ sub processSubmit {
 
       try {
 #Apostroph's need to be replaced with doubles  and white space fixed for the SQL.
-          $log =~ s/(?<=\w) ?' ?(?=\w)/''/g;
+          $log =~ s/'/''/g;
 
           if ( $edit_mode && $edit_mode != "0" ) {
 
@@ -697,7 +697,7 @@ sub processSubmit {
                   $stmt =
 'SELECT rowid, ID_CAT, DATE, LOG, AMMOUNT from LOG where rowid <= "'
                     . $rs_cur
-                    . '" ORDER BY DATE DESC;;;'
+                    . '" ORDER BY DATE DESC;'
                     . $rs_page;
                   return;
             }
@@ -707,12 +707,7 @@ sub processSubmit {
 
               #check for double entry
               #
-              my $st =
-                $db->prepare( "SELECT DATE,LOG FROM LOG where DATE='"
-                    . $date
-                    . "' AND LOG='"
-                    . $log
-                    . "';" );
+              my $st = $db->prepare( qq(SELECT DATE,LOG FROM LOG where DATE='$date' AND LOG='$log';) );
 
               $st->execute();
               if ( my @row = $st->fetchrow_array() ) {

diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js
index 8c988ea1cd42d3a54e5cdb5eb970394e9ef93364..d827b7ec3fbd11b135e282b185aae362bece9392 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main.js
+++ b/htdocs/cgi-bin/wsrc/main.js
@@ -86,10 +86,10 @@ function loadedBody(toggle) {
 
     $("#menu_close").click(function() {
         $("#menu").effect("shake", {}, 1000, function() {
-        $("#menu").effect("drop", { direction: "down" }, 1500, function() {
+            $("#menu").effect("drop", { direction: "down" }, 1500, function() {
                 $("#menu").hide();
             })
-             })
+        })
     });
 
 
@@ -110,8 +110,10 @@ function showFloatingMenu() {
     $("#div_log").toggle();
     return false;
 }
-function hideLog(){
-    $("#div_log").hide(); return false;
+
+function hideLog() {
+    $("#div_log").hide();
+    return false;
 }
 
 function encodeText(el) {