More updates.

[kiriwrite/.git] / cgi-files / Modules / Database / SQLite.pm

diff --git a/cgi-files/Modules/Database/SQLite.pm b/cgi-files/Modules/Database/SQLite.pm
index 28c7cba..72ae6a5 100644 (file)
--- a/cgi-files/Modules/Database/SQLite.pm
+++ b/cgi-files/Modules/Database/SQLite.pm
@@ -605,11 +605,11 @@ sub getdblist{
 
        foreach $database (@data_directory){
 
-               $database =~ s/.db.sqlite$//g;
+               $database =~ s/.db.sqlite$//og;
                $database_filename_friendly = $database;
 
                #$database_filename_length = length($database);
-               #$database_filename_friendly = substr($database, 0, $database_filename_length - 3);
+               #$database_filename_friendly = substr($database, 0, $database_filename_length - 10);
                push(@data_directory_final, $database_filename_friendly);
 
        }
@@ -1204,6 +1204,12 @@ sub getpageinfo{
        my $page_filename       = $passedoptions->{"PageFilename"};
        my $page_reduced        = $passedoptions->{"Reduced"};
 
+       if (!$page_reduced){
+
+               $page_reduced = 0;
+
+       }
+
        if ($page_reduced eq 1){
 
                $string_handle  = $database_handle->prepare('SELECT filename, pagename, pagedescription, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
@@ -1524,6 +1530,8 @@ sub editpage{
        # Check if there is a page that already exists with the new
        # filename.
 
+       $page_found = 0;
+
        if ($page_filename ne $page_newfilename){
 
                $string_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_newfilename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );