Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
More modifications
[kiriwrite/.git] / cgi-files / Modules / Database / SQLite.pm
index 92bce19..f4a9d1b 100644 (file)
@@ -30,28 +30,29 @@ use warnings;
 
 # Load the following Perl modules.
 
-use DBI qw();
+use DBI qw(:sql_types);
 
 # Set the following values.
 
 our $VERSION   = "0.1.0";
 my ($options, %options);
 my $database_handle;
-my $string_handle;
-my $second_database_handle;
-my $second_string_handle;
+my $statement_handle;
+my $error = "";
+my $errorext = "";
 my $database_filename;
 my $second_database_filename;
+my $second_database_handle;
+my $second_statement_handle;
 my $templatedb_loaded = 0;
 my $templatedb_exists = 1;
-my $template_string_handle;
+my $template_statement_handle;
 my $template_database_handle;
 my $filterdb_loaded = 0;
 my $filterdb_exists = 1;
-my $filterdb_string_handle;
+my $filterdb_statement_handle;
 my $filterdb_database_handle;
-my $error = "";
-my $errorext = "";
+
 
 #################################################################################
 # Generic Subroutines.                                                         #
@@ -604,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);
 
        }
@@ -637,12 +638,12 @@ sub getdatabaseinfo{
        $error = "";
        $errorext = "";
 
-       $string_handle = $database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM kiriwrite_database_info LIMIT 1') or (
+       $statement_handle = $database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM kiriwrite_database_info LIMIT 1') or (
                $error = "DatabaseError", $errorext = $database_handle->errstr, return
        );
-       $string_handle->execute();
+       $statement_handle->execute();
 
-       @sqldata = $string_handle->fetchrow_array();
+       @sqldata = $statement_handle->fetchrow_array();
 
        # Process the database information into a hash.
 
@@ -656,8 +657,8 @@ sub getdatabaseinfo{
                "Revision"      => $sqldata[6]
        );
 
-       $string_handle->finish();
-       undef $string_handle;
+       $statement_handle->finish();
+       undef $statement_handle;
 
        return %databaseinfo;
 
@@ -682,12 +683,12 @@ sub getseconddatabaseinfo{
        $error = "";
        $errorext = "";
 
-       $second_string_handle = $second_database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM kiriwrite_database_info LIMIT 1') or (
+       $second_statement_handle = $second_database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM kiriwrite_database_info LIMIT 1') or (
                $error = "DatabaseError", $errorext = $second_database_handle->errstr, return
        );
-       $second_string_handle->execute();
+       $second_statement_handle->execute();
 
-       @sqldata = $second_string_handle->fetchrow_array();
+       @sqldata = $second_statement_handle->fetchrow_array();
 
        # Process the database information into a hash.
 
@@ -701,8 +702,8 @@ sub getseconddatabaseinfo{
                "Revision"      => $sqldata[6]
        );
 
-       $second_string_handle->finish();
-       undef $second_string_handle;
+       $second_statement_handle->finish();
+       undef $second_statement_handle;
 
        return %databaseinfo;
 
@@ -762,7 +763,7 @@ sub adddatabase{
 
        $database_handle        = DBI->connect("dbi:SQLite:dbname=" . $options{"Directory"} . '/' . $dbfilename . ".db.sqlite");
        $database_handle->{unicode} = 1;
-       $string_handle          = $database_handle->prepare('CREATE TABLE kiriwrite_database_info(
+       $statement_handle               = $database_handle->prepare('CREATE TABLE kiriwrite_database_info(
                        name varchar(256) primary key, 
                        description varchar(512), 
                        notes text, 
@@ -771,9 +772,9 @@ sub adddatabase{
                        kiriwrite_version_minor int(4), 
                        kiriwrite_version_revision int(4)
        )') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
-       $string_handle  = $database_handle->prepare('CREATE TABLE kiriwrite_database_pages(
+       $statement_handle       = $database_handle->prepare('CREATE TABLE kiriwrite_database_pages(
                        filename varchar(256) primary key, 
                        pagename varchar(512), 
                        pagedescription varchar(512), 
@@ -783,12 +784,12 @@ sub adddatabase{
                        pagesettings int(1),
                        lastmodified datetime
        )') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
        # Convert the values into SQL query formatted values and add an entry
        # to the kiriwrite_database_info table.
 
-       $string_handle = $database_handle->prepare('INSERT INTO kiriwrite_database_info (name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision) VALUES(
+       $statement_handle = $database_handle->prepare('INSERT INTO kiriwrite_database_info (name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision) VALUES(
                \'' . $class->convert($dbname) . '\',
                \'' . $class->convert($dbdescription) . '\',
                \'' . $class->convert($dbnotes) . '\',
@@ -797,7 +798,7 @@ sub adddatabase{
                \'' . $class->convert($dbminorver) . '\',
                \'' . $class->convert($dbrevisionver) . '\'
        )') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
 }
 
@@ -928,22 +929,22 @@ sub editdatabase{
 
        # Get the current database information.
 
-       $string_handle = $database_handle->prepare('SELECT name FROM kiriwrite_database_info LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT name FROM kiriwrite_database_info LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       my @database_oldinfo    = $string_handle->fetchrow_array();
+       my @database_oldinfo    = $statement_handle->fetchrow_array();
 
        my $dboldname           = $database_oldinfo[0];
 
        # Update the database information.
 
-       $string_handle = $database_handle->prepare('UPDATE kiriwrite_database_info SET name = \'' . $class->convert($dbname) . '\',
+       $statement_handle = $database_handle->prepare('UPDATE kiriwrite_database_info SET name = \'' . $class->convert($dbname) . '\',
        description = \'' . $class->convert($dbdescription) . '\',
        notes = \'' . $class->convert($dbnotes) . '\',
        categories = \'' . $class->convert($dbcategories) . '\'') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
-       undef $string_handle;
+       undef $statement_handle;
        return;
 
 }
@@ -1151,15 +1152,15 @@ sub getpagelist{
 
        my $class       = shift;
        
-       $string_handle  = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle       = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
        my @database_pagefilenames;
        my @database_pagefilenames_final;
 
        # Process the collected pages.
 
-       while (@database_pagefilenames = $string_handle->fetchrow_array){
+       while (@database_pagefilenames = $statement_handle->fetchrow_array){
 
                # Add each page to the list of pages in the database.
 
@@ -1167,7 +1168,7 @@ sub getpagelist{
 
        }
 
-       undef $string_handle;
+       undef $statement_handle;
        return @database_pagefilenames_final;
 
 }
@@ -1183,6 +1184,8 @@ sub getpageinfo{
 # options      Specifies the following options in any order.                   #
 #                                                                              #
 # PageFilename Specifies the page filename to get the page information from.   #
+# Reduced      Specifies if the reduced version of the page information should #
+#              be retrieved.                                                   #
 #################################################################################
 
        $error = "";
@@ -1199,39 +1202,82 @@ sub getpageinfo{
        # Get the page from the database.
 
        my $page_filename       = $passedoptions->{"PageFilename"};
+       my $page_reduced        = $passedoptions->{"Reduced"};
 
-       $string_handle  = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       if (!$page_reduced){
 
-       # Check if the page exists in the database.
+               $page_reduced = 0;
 
-       while (@data_page = $string_handle->fetchrow_array()){
+       }
 
-               # Get the values from the array.
+       if ($page_reduced eq 1){
 
-               $pagefilename           = $data_page[0];
-               $pagename               = $data_page[1];
-               $pagedescription        = $data_page[2];
-               $pagesection            = $data_page[3];
-               $pagetemplate           = $data_page[4];
-               $pagedata               = $data_page[5];
-               $pagesettings           = $data_page[6];
-               $pagelastmodified       = $data_page[7];
+               $statement_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 );
 
-               # Put the values into the page hash.
+               $statement_handle->execute();
 
-               %database_page = (
-                       "PageFilename"          => $pagefilename,
-                       "PageName"              => $pagename,
-                       "PageDescription"       => $pagedescription,
-                       "PageSection"           => $pagesection,
-                       "PageTemplate"          => $pagetemplate,
-                       "PageContent"           => $pagedata,
-                       "PageSettings"          => $pagesettings,
-                       "PageLastModified"      => $class->dateconvert($pagelastmodified),
-               );
+               # Check if the page exists in the database.
 
-               $page_found = 1;
+               while (@data_page = $statement_handle->fetchrow_array()){
+       
+                       # Get the values from the array.
+       
+                       $pagefilename           = $data_page[0];
+                       $pagename               = $data_page[1];
+                       $pagedescription        = $data_page[2];
+                       $pagelastmodified       = $data_page[3];
+       
+                       # Put the values into the page hash.
+       
+                       %database_page = (
+                               "PageFilename"          => $pagefilename,
+                               "PageName"              => $pagename,
+                               "PageDescription"       => $pagedescription,
+                               "PageLastModified"      => $class->dateconvert($pagelastmodified),
+                       );
+       
+                       $page_found = 1;
+       
+               }
+
+
+       } else {
+               
+               $statement_handle       = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+
+               $statement_handle->execute();
+
+               # Check if the page exists in the database.
+
+               while (@data_page = $statement_handle->fetchrow_array()){
+       
+                       # Get the values from the array.
+       
+                       $pagefilename           = $data_page[0];
+                       $pagename               = $data_page[1];
+                       $pagedescription        = $data_page[2];
+                       $pagesection            = $data_page[3];
+                       $pagetemplate           = $data_page[4];
+                       $pagedata               = $data_page[5];
+                       $pagesettings           = $data_page[6];
+                       $pagelastmodified       = $data_page[7];
+       
+                       # Put the values into the page hash.
+       
+                       %database_page = (
+                               "PageFilename"          => $pagefilename,
+                               "PageName"              => $pagename,
+                               "PageDescription"       => $pagedescription,
+                               "PageSection"           => $pagesection,
+                               "PageTemplate"          => $pagetemplate,
+                               "PageContent"           => $pagedata,
+                               "PageSettings"          => $pagesettings,
+                               "PageLastModified"      => $class->dateconvert($pagelastmodified),
+                       );
+       
+                       $page_found = 1;
+       
+               }
 
        }
        
@@ -1244,7 +1290,7 @@ sub getpageinfo{
 
        }
 
-       undef $string_handle;
+       undef $statement_handle;
        return %database_page;
 
 }
@@ -1292,13 +1338,13 @@ sub addpage{
        # Check to see if the filename given already exists
        # in the page database.
 
-       $string_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
        # Check if a page with the filename given really does
        # exist.
 
-       while (@database_page = $string_handle->fetchrow_array()){
+       while (@database_page = $statement_handle->fetchrow_array()){
 
                # A page does exist so increment the count to 1.
 
@@ -1346,7 +1392,7 @@ sub addpage{
 
        # Add the page to the selected database.
 
-       $string_handle = $database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES (
+       $statement_handle = $database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES (
                \'' . $class->convert($page_filename) . '\',
                \'' . $class->convert($page_name) . '\',
                \'' . $class->convert($page_description) . '\',
@@ -1356,9 +1402,9 @@ sub addpage{
                \'' . $class->convert($page_settings) . '\',
                \'' . $class->convert($page_date) . '\'
        )') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
-       undef $string_handle;
+       undef $statement_handle;
 
 }
 
@@ -1391,10 +1437,10 @@ sub deletepage{
 
        # Check if the page exists before deleting it.
 
-       $string_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@page_info = $string_handle->fetchrow_array()){
+       while (@page_info = $statement_handle->fetchrow_array()){
 
                $page_found = 1;
 
@@ -1411,8 +1457,8 @@ sub deletepage{
 
        # Delete the page.
 
-       $string_handle = $database_handle->prepare('DELETE FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\'') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('DELETE FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\'') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
 }
 
@@ -1459,12 +1505,12 @@ sub editpage{
 
        # Check if the page with the filename given exists.
 
-       $string_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
        # Check if the page really does exist.
 
-       while (@page_info = $string_handle->fetchrow_array()){
+       while (@page_info = $statement_handle->fetchrow_array()){
 
                # The page information is found.
 
@@ -1481,6 +1527,35 @@ sub editpage{
 
        }
 
+       # Check if there is a page that already exists with the new
+       # filename.
+
+       $page_found = 0;
+
+       if ($page_filename ne $page_newfilename){
+
+               $statement_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 );
+               $statement_handle->execute();
+
+               # Check if a page really is using the new filename.
+
+               while (@page_info = $statement_handle->fetchrow_array()){
+
+                       # The page information is found.
+
+                       $page_found = 1;
+
+               }
+
+               if ($page_found eq 1){
+
+                       $error = "PageExists";
+                       return;
+
+               }
+
+       }
+
        # Get the current date.
 
        my ($created_second, $created_minute, $created_hour, $created_day, $created_month, $created_year, $created_weekday, $created_yearday, $created_dst) = localtime;
@@ -1488,8 +1563,8 @@ sub editpage{
 
        # Edit the selected page.
 
-       $string_handle = $database_handle->prepare('UPDATE kiriwrite_database_pages SET filename = \'' . $class->convert($page_newfilename) . '\', pagename = \'' . $class->convert($page_newname) . '\', pagedescription = \'' . $class->convert($page_newdescription) . '\', pagesection = \'' . $class->convert($page_newsection) . '\', pagetemplate = \'' . $class->convert($page_newtemplate) . '\', pagedata = \'' . $class->convert($page_newcontent) . '\', pagedata = \'' . $class->convert($page_newcontent) . '\', pagesettings = \'' . $class->convert($page_newsettings) . '\', lastmodified = \'' . $page_date . '\' WHERE filename = \'' . $class->convert($page_filename) . '\'')  or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('UPDATE kiriwrite_database_pages SET filename = \'' . $class->convert($page_newfilename) . '\', pagename = \'' . $class->convert($page_newname) . '\', pagedescription = \'' . $class->convert($page_newdescription) . '\', pagesection = \'' . $class->convert($page_newsection) . '\', pagetemplate = \'' . $class->convert($page_newtemplate) . '\', pagedata = \'' . $class->convert($page_newcontent) . '\', pagedata = \'' . $class->convert($page_newcontent) . '\', pagesettings = \'' . $class->convert($page_newsettings) . '\', lastmodified = \'' . $page_date . '\' WHERE filename = \'' . $class->convert($page_filename) . '\'')  or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
 }
 
@@ -1525,12 +1600,12 @@ sub movepage{
 
        # Check if the page with the filename given exists.
 
-       $string_handle = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
        # Check if the page really does exist.
 
-       while (@page_info = $string_handle->fetchrow_array()){
+       while (@page_info = $statement_handle->fetchrow_array()){
 
                # Get the values from the array.
 
@@ -1577,10 +1652,10 @@ sub movepage{
        $page_found = 0;
        @page_info = ();
 
-       $second_string_handle = $second_database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return );
-       $second_string_handle->execute();
+       $second_statement_handle = $second_database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return );
+       $second_statement_handle->execute();
 
-       while (@page_info = $second_string_handle->fetchrow_array()){
+       while (@page_info = $second_statement_handle->fetchrow_array()){
 
                $page_found = 1;
 
@@ -1597,7 +1672,7 @@ sub movepage{
 
        # Add the page to the new database.
 
-       $second_string_handle = $second_database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES (
+       $second_statement_handle = $second_database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES (
                \'' . $class->convert($database_page{"PageFilename"}) . '\',
                \'' . $class->convert($database_page{"PageName"}) . '\',
                \'' . $class->convert($database_page{"PageDescription"}) . '\',
@@ -1607,12 +1682,12 @@ sub movepage{
                \'' . $class->convert($database_page{"PageSettings"}) . '\',
                \'' . $class->convert($database_page{"PageLastModified"}) . '\'
        )') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return );
-       $second_string_handle->execute();
+       $second_statement_handle->execute();
 
        # Delete the page from the old database.
 
-       $string_handle = $database_handle->prepare('DELETE FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($database_page{"PageFilename"}) . '\'') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('DELETE FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($database_page{"PageFilename"}) . '\'') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
 }
 
@@ -1648,12 +1723,12 @@ sub copypage{
 
        # Check if the page with the filename given exists.
 
-       $string_handle = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
        # Check if the page really does exist.
 
-       while (@page_info = $string_handle->fetchrow_array()){
+       while (@page_info = $statement_handle->fetchrow_array()){
 
                # Get the values from the array.
 
@@ -1700,10 +1775,10 @@ sub copypage{
        $page_found = 0;
        @page_info = ();
 
-       $second_string_handle = $second_database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return );
-       $second_string_handle->execute();
+       $second_statement_handle = $second_database_handle->prepare('SELECT filename FROM kiriwrite_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return );
+       $second_statement_handle->execute();
 
-       while (@page_info = $second_string_handle->fetchrow_array()){
+       while (@page_info = $second_statement_handle->fetchrow_array()){
 
                $page_found = 1;
 
@@ -1720,7 +1795,7 @@ sub copypage{
 
        # Add the page to the new database.
 
-       $second_string_handle = $second_database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES (
+       $second_statement_handle = $second_database_handle->prepare('INSERT INTO kiriwrite_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES (
                \'' . $class->convert($database_page{"PageFilename"}) . '\',
                \'' . $class->convert($database_page{"PageName"}) . '\',
                \'' . $class->convert($database_page{"PageDescription"}) . '\',
@@ -1730,7 +1805,7 @@ sub copypage{
                \'' . $class->convert($database_page{"PageSettings"}) . '\',
                \'' . $class->convert($database_page{"PageLastModified"}) . '\'
        )') or ( $error = "NewDatabaseError", $errorext = $second_database_handle->errstr, return );
-       $second_string_handle->execute();
+       $second_statement_handle->execute();
 
 }
 
@@ -1793,7 +1868,7 @@ sub connectfilter{
        # Connect to the template database.
 
        $filterdb_database_handle = DBI->connect("dbi:SQLite:dbname=filters.db.sqlite");
-       $database_handle->{unicode} = 1;
+       $filterdb_database_handle->{unicode} = 1;
        $filterdb_loaded = 1;
 
 }
@@ -1811,7 +1886,7 @@ sub disconnectfilter{
 
        if ($filterdb_loaded eq 1){
 
-               undef $filterdb_string_handle;
+               undef $filterdb_statement_handle;
                $filterdb_database_handle->disconnect();
 
        }
@@ -1835,10 +1910,10 @@ sub getfilterlist{
 
        # Get the list of filters available.
 
-       $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY priority ASC') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
-       $filterdb_string_handle->execute();
+       $filterdb_statement_handle      = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY priority ASC') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
+       $filterdb_statement_handle->execute();
 
-       while (@filter_data = $filterdb_string_handle->fetchrow_array()){
+       while (@filter_data = $filterdb_statement_handle->fetchrow_array()){
 
                # Add the filter to the list of available filters.
 
@@ -1846,7 +1921,7 @@ sub getfilterlist{
 
        }
 
-       undef $filterdb_string_handle;
+       undef $filterdb_statement_handle;
        return @filter_list;
 
 }
@@ -1880,12 +1955,12 @@ sub getfilterinfo{
 
        my $filter_id           = $passedoptions->{"FilterID"};
 
-       $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id, priority, findsetting, replacesetting, notes FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
-       $filterdb_string_handle->execute();
+       $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id, priority, findsetting, replacesetting, notes FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
+       $filterdb_statement_handle->execute();
 
        # Get the filter information.
 
-       while (@filter_data = $filterdb_string_handle->fetchrow_array()){
+       while (@filter_data = $filterdb_statement_handle->fetchrow_array()){
 
                $filter_info{"FilterID"}        = $filter_data[0];
                $filter_info{"FilterPriority"}  = $filter_data[1];
@@ -1911,7 +1986,7 @@ sub getfilterinfo{
 
        # Return the filter information.
 
-       undef $filterdb_string_handle;
+       undef $filterdb_statement_handle;
        return %filter_info;
 
 }
@@ -2013,7 +2088,7 @@ sub addfilter{
 
        # Check if the filter table exists.
 
-       $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY id ASC') or ( $nofiltertable = 1 );
+       $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY id ASC') or ( $nofiltertable = 1 );
 
        # Check if there is really no filter table.
 
@@ -2021,23 +2096,23 @@ sub addfilter{
 
                # Create the filter database table.
 
-               $filterdb_string_handle = $filterdb_database_handle->prepare('CREATE TABLE kiriwrite_filters (
+               $filterdb_statement_handle = $filterdb_database_handle->prepare('CREATE TABLE kiriwrite_filters (
                        id int(7) primary key,
                        priority int(5),
                        findsetting varchar(1024),
                        replacesetting varchar(1024),
                        notes text
                )') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
-               $filterdb_string_handle->execute();
+               $filterdb_statement_handle->execute();
 
        }
 
        # Find the lowest filter identification number available.
 
-       $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY id ASC') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
-       $filterdb_string_handle->execute();
+       $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters ORDER BY id ASC') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
+       $filterdb_statement_handle->execute();
 
-       while (@database_filters = $filterdb_string_handle->fetchrow_array()){
+       while (@database_filters = $filterdb_statement_handle->fetchrow_array()){
 
                $filter_id      = $database_filters[0];
 
@@ -2057,12 +2132,12 @@ sub addfilter{
 
                $new_id = $filter_id + 1;
 
-               $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters WHERE id = \'' . $class->convert($new_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
-               $filterdb_string_handle->execute();
+               $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters WHERE id = \'' . $class->convert($new_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
+               $filterdb_statement_handle->execute();
 
                # Get the filter identification number.
 
-               while (@filterid_check = $filterdb_string_handle->fetchrow_array()){
+               while (@filterid_check = $filterdb_statement_handle->fetchrow_array()){
 
                        $filter_found = 1;
 
@@ -2086,11 +2161,11 @@ sub addfilter{
 
        }
 
-       # Check if there were any filters in the filters database.
+       # Check if there were any filters in the filter database.
 
        if (!$filter_count && !$new_id){
 
-               # There were no filters in the filters database so set
+               # There were no filters in the filter database so set
                # the new filter identification value to 1.
 
                $new_id = 1;
@@ -2099,14 +2174,14 @@ sub addfilter{
 
        # Add the filter to the filter database.
 
-       $filterdb_string_handle = $filterdb_database_handle->prepare('INSERT INTO kiriwrite_filters (id, priority, findsetting, replacesetting, notes) VALUES (
+       $filterdb_statement_handle = $filterdb_database_handle->prepare('INSERT INTO kiriwrite_filters (id, priority, findsetting, replacesetting, notes) VALUES (
                \'' . $class->convert($new_id) . '\',
                \'' . $class->convert($filter_priority) . '\',
                \'' . $class->convert($filter_find) . '\',
                \'' . $class->convert($filter_replace) .'\',
                \'' . $class->convert($filter_notes) . '\'
        )') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
-       $filterdb_string_handle->execute();
+       $filterdb_statement_handle->execute();
 
 }
 
@@ -2163,12 +2238,12 @@ sub editfilter{
 
        # Check if the filter exists before editing it.
 
-       $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
-       $filterdb_string_handle->execute();
+       $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
+       $filterdb_statement_handle->execute();
 
        # Check if the filter exists.
 
-       while (@filter_data = $filterdb_string_handle->fetchrow_array()){
+       while (@filter_data = $filterdb_statement_handle->fetchrow_array()){
 
                $filter_exists = 1;
 
@@ -2188,15 +2263,15 @@ sub editfilter{
 
        # Edit the selected filter.
 
-       $filterdb_string_handle = $filterdb_database_handle->prepare('UPDATE kiriwrite_filters SET
+       $filterdb_statement_handle = $filterdb_database_handle->prepare('UPDATE kiriwrite_filters SET
                findsetting = \'' . $class->convert($filter_newfind) . '\',
                replacesetting = \'' . $class->convert($filter_newreplace) . '\',
                priority = \'' . $class->convert($filter_newpriority) . '\',
                notes = \'' . $class->convert($filter_newnotes) . '\'
        WHERE id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );      
-       $filterdb_string_handle->execute();
+       $filterdb_statement_handle->execute();
 
-       undef $filterdb_string_handle;
+       undef $filterdb_statement_handle;
        return;
 
 }
@@ -2231,10 +2306,10 @@ sub deletefilter{
 
        # Check if the filter exists before deleting.
 
-       $filterdb_string_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
-       $filterdb_string_handle->execute();
+       $filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
+       $filterdb_statement_handle->execute();
 
-       while (@filter_data = $filterdb_string_handle->fetchrow_array()){
+       while (@filter_data = $filterdb_statement_handle->fetchrow_array()){
 
                $filter_exists = 1;
 
@@ -2251,10 +2326,10 @@ sub deletefilter{
 
        # Delete the filter from the filter database.
 
-       $filterdb_string_handle = $filterdb_database_handle->prepare('DELETE FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
-       $filterdb_string_handle->execute();
+       $filterdb_statement_handle = $filterdb_database_handle->prepare('DELETE FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
+       $filterdb_statement_handle->execute();
 
-       undef $filterdb_string_handle;
+       undef $filterdb_statement_handle;
 
 }
 
@@ -2317,7 +2392,7 @@ sub connecttemplate{
        # Connect to the template database.
 
        $template_database_handle = DBI->connect("dbi:SQLite:dbname=templates.db.sqlite");
-       $database_handle->{unicode} = 1;
+       $template_database_handle->{unicode} = 1;
        $templatedb_loaded = 1;
 
 }
@@ -2335,7 +2410,7 @@ sub disconnecttemplate{
 
        if ($templatedb_loaded eq 1){
 
-               undef $template_string_handle;
+               undef $template_statement_handle;
                $template_database_handle->disconnect();
 
        }
@@ -2354,14 +2429,14 @@ sub gettemplatelist{
        $error = "";
        $errorext = "";
 
-       $template_string_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates ORDER BY filename ASC') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
-       $template_string_handle->execute();
+       $template_statement_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates ORDER BY filename ASC') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
+       $template_statement_handle->execute();
 
        my @database_template;
        my @templates_list;
        my $template_filename;
 
-       while (@database_template = $template_string_handle->fetchrow_array()){
+       while (@database_template = $template_statement_handle->fetchrow_array()){
 
                # Get certain values from the array.
 
@@ -2411,10 +2486,10 @@ sub gettemplateinfo{
 
        my $filename    = $passedoptions->{"TemplateFilename"};
 
-       $template_string_handle = $template_database_handle->prepare('SELECT filename, templatename, templatedescription, templatelayout, datemodified FROM kiriwrite_templates WHERE filename = \'' . $class->convert($filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
-       $template_string_handle->execute();
+       $template_statement_handle = $template_database_handle->prepare('SELECT filename, templatename, templatedescription, templatelayout, datemodified FROM kiriwrite_templates WHERE filename = \'' . $class->convert($filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
+       $template_statement_handle->execute();
 
-       while (@template_data = $template_string_handle->fetchrow_array()){
+       while (@template_data = $template_statement_handle->fetchrow_array()){
 
                # Get certain values from the array.
 
@@ -2503,13 +2578,13 @@ sub addtemplate{
 
        if ($templatedb_exists eq 0){
 
-               $template_string_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ($blankfile = 1);
+               $template_statement_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ($blankfile = 1);
 
                if ($blankfile eq 0){
 
-                       $template_string_handle->execute();
+                       $template_statement_handle->execute();
 
-                       while (@page_exists = $template_string_handle->fetchrow_array()){
+                       while (@page_exists = $template_statement_handle->fetchrow_array()){
 
                                $error = "TemplatePageExists";
                                return;
@@ -2561,7 +2636,7 @@ sub addtemplate{
 
        # Check to see if a template can be added.
 
-       $template_string_handle = $template_database_handle->prepare('INSERT INTO kiriwrite_templates (filename, templatename, templatedescription, templatelayout, datemodified) VALUES(
+       $template_statement_handle = $template_database_handle->prepare('INSERT INTO kiriwrite_templates (filename, templatename, templatedescription, templatelayout, datemodified) VALUES(
                                \'' . $class->convert($template_filename) . '\',
                                \'' . $class->convert($template_name) . '\',
                                \'' . $class->convert($template_description) . '\',
@@ -2571,7 +2646,7 @@ sub addtemplate{
 
        if (!$notemplatetable){
 
-               $template_string_handle->execute();
+               $template_statement_handle->execute();
 
        }
 
@@ -2581,35 +2656,35 @@ sub addtemplate{
 
                # Create a template table.
 
-       my $directory_permissions = main::kiriwrite_filepermissions(".", 1, 1, 0);
+               my $directory_permissions = main::kiriwrite_filepermissions(".", 1, 1, 0);
 
-       if ($directory_permissions eq 1){
+               if ($directory_permissions eq 1){
 
-               # The template database cannot be created because of invalid directory
-               # permissions so return an error.
+                       # The template database cannot be created because of invalid directory
+                       # permissions so return an error.
 
-               $error = "TemplateDatabaseFileUncreateable";
-               return;
+                       $error = "TemplateDatabaseFileUncreateable";
+                       return;
 
-       }
+               }
 
-               $template_string_handle = $template_database_handle->prepare('create table kiriwrite_templates(
+               $template_statement_handle = $template_database_handle->prepare('create table kiriwrite_templates(
                        filename varchar(256) primary key,
                        templatename varchar(512),
                        templatedescription varchar(512),
                        templatelayout text,
                        datemodified datetime
                );') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
-               $template_string_handle->execute();
+               $template_statement_handle->execute();
 
-               $template_string_handle = $template_database_handle->prepare('INSERT INTO kiriwrite_templates (filename, templatename, templatedescription, templatelayout, datemodified) VALUES(
+               $template_statement_handle = $template_database_handle->prepare('INSERT INTO kiriwrite_templates (filename, templatename, templatedescription, templatelayout, datemodified) VALUES(
                                \'' . $class->convert($template_filename) . '\',
                                \'' . $class->convert($template_name) . '\',
                                \'' . $class->convert($template_description) . '\',
                                \'' . $class->convert($template_layout) . '\',
                                \'' . $class->convert($template_date) . '\'
                )') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
-               $template_string_handle->execute();
+               $template_statement_handle->execute();
 
        }
 
@@ -2642,10 +2717,10 @@ sub deletetemplate{
 
        # Check if the template exists.
 
-       $template_string_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
-       $template_string_handle->execute();
+       $template_statement_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
+       $template_statement_handle->execute();
 
-       while (@pagedata = $template_string_handle->fetchrow_array()){
+       while (@pagedata = $template_statement_handle->fetchrow_array()){
 
                $template_count++;
 
@@ -2662,8 +2737,8 @@ sub deletetemplate{
 
        # Delete the template from the template database.
 
-       $template_string_handle = $template_database_handle->prepare('DELETE FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
-       $template_string_handle->execute();
+       $template_statement_handle = $template_database_handle->prepare('DELETE FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
+       $template_statement_handle->execute();
 
 }
 
@@ -2715,10 +2790,10 @@ sub edittemplate{
 
        # Check if the template exists.
 
-       $template_string_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
-       $template_string_handle->execute();
+       $template_statement_handle = $template_database_handle->prepare('SELECT filename FROM kiriwrite_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
+       $template_statement_handle->execute();
 
-       while (@template_info = $template_string_handle->fetchrow_array()){
+       while (@template_info = $template_statement_handle->fetchrow_array()){
 
                $template_found = 1;
 
@@ -2741,7 +2816,7 @@ sub edittemplate{
 
        # Update the template information.
 
-       $template_string_handle = $template_database_handle->prepare('UPDATE kiriwrite_templates SET
+       $template_statement_handle = $template_database_handle->prepare('UPDATE kiriwrite_templates SET
                filename = \'' . $class->convert($new_template_filename) . '\',
                templatename = \'' . $class->convert($new_template_name) . '\',
                templatedescription = \'' . $class->convert($new_template_description) . '\',
@@ -2749,7 +2824,7 @@ sub edittemplate{
                datemodified = \'' . $class->convert($templatenewdate) . '\'
                WHERE filename = \'' . $class->convert($template_filename) . '\'
        ') or ( $error = "TemplateDatabaseError", $errorext = $template_database_handle->errstr, return );
-       $template_string_handle->execute();
+       $template_statement_handle->execute();
 
 }
 
@@ -2781,7 +2856,7 @@ sub disconnect{
 
        # This function is not needed in this database module.
 
-       undef $string_handle;
+       undef $statement_handle;
 
 }
 
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy