More modifications

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

diff --git a/cgi-files/Modules/Database/MySQL5.pm b/cgi-files/Modules/Database/MySQL5.pm
index c398c6d..42c3fd9 100644 (file)
--- a/cgi-files/Modules/Database/MySQL5.pm
+++ b/cgi-files/Modules/Database/MySQL5.pm
@@ -38,7 +38,7 @@ use DBI qw(:sql_types);
 our $VERSION   = "0.1.0";
 my ($options, %options);
 my $database_handle;
-my $string_handle;
+my $statement_handle;
 my $error;
 my $errorext;
 my $database_filename;
@@ -491,10 +491,10 @@ sub dbexists{
 
        # Check if the table exists.
 
-       $string_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($filename) . '_database_info\'') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($filename) . '_database_info\'') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@table_data = $string_handle->fetchrow_array()){
+       while (@table_data = $statement_handle->fetchrow_array()){
 
                $table_exists = 1;
 
@@ -554,9 +554,9 @@ sub disconnect{
        
        # Disconnect from the server.
 
-       if ($string_handle){
+       if ($statement_handle){
 
-               $string_handle->finish();
+               $statement_handle->finish();
 
        }
 
@@ -586,15 +586,15 @@ sub getdblist{
 
        # Get the list of databases.
 
-       $string_handle = $database_handle->prepare("SHOW TABLES") or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare("SHOW TABLES") or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
        my @final_table_list;   
        my @database_table_list;
        my @table_name;
        my $table;
 
-       while (@table_name = $string_handle->fetchrow_array()){
+       while (@table_name = $statement_handle->fetchrow_array()){
 
                push(@database_table_list, decode_utf8($table_name[0]));
 
@@ -683,10 +683,10 @@ sub getdatabaseinfo{
        my ($databaseinfo, %databaseinfo);
        my ($sqldata, @sqldata);
 
-       $string_handle = $database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_info LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_info LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       @sqldata = $string_handle->fetchrow_array();
+       @sqldata = $statement_handle->fetchrow_array();
 
        # Process the database information into a hash.
 
@@ -701,7 +701,7 @@ sub getdatabaseinfo{
                "Revision"      => decode_utf8($sqldata[6])
        );
 
-       $string_handle->finish();
+       $statement_handle->finish();
 
        return %databaseinfo;
 
@@ -773,10 +773,10 @@ sub getseconddatabaseinfo{
        $error = "";
        $errorext = "";
 
-       $string_handle = $database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($second_database_filename) . '_database_info LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($second_database_filename) . '_database_info LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       @sqldata = $string_handle->fetchrow_array();
+       @sqldata = $statement_handle->fetchrow_array();
 
        # Process the database information into a hash.
 
@@ -790,7 +790,7 @@ sub getseconddatabaseinfo{
                "Revision"      => decode_utf8($sqldata[6])
        );
 
-       $string_handle->finish();
+       $statement_handle->finish();
 
        return %databaseinfo;
 
@@ -848,7 +848,7 @@ sub adddatabase{
 
        # Create the database structure (info and page tables);
 
-       $string_handle  = $database_handle->prepare('CREATE TABLE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbfilename) . '_database_info (
+       $statement_handle       = $database_handle->prepare('CREATE TABLE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbfilename) . '_database_info (
                        name varchar(256) primary key,
                        description varchar(512), 
                        notes mediumtext,
@@ -857,9 +857,9 @@ sub adddatabase{
                        kiriwrite_version_minor int(4), 
                        kiriwrite_version_revision int(4)
        ) DEFAULT CHARSET=utf8') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
-       $string_handle  = $database_handle->prepare('CREATE TABLE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbfilename) . '_database_pages (
+       $statement_handle       = $database_handle->prepare('CREATE TABLE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbfilename) . '_database_pages (
                        filename varchar(256) primary key, 
                        pagename varchar(512), 
                        pagedescription varchar(512), 
@@ -869,12 +869,12 @@ sub adddatabase{
                        pagesettings int(1),
                        lastmodified datetime
        ) DEFAULT CHARSET=utf8') 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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbfilename) . '_database_info (name, description, notes, categories, kiriwrite_version_major, kiriwrite_version_minor, kiriwrite_version_revision) VALUES(
+       $statement_handle = $database_handle->prepare('INSERT INTO ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbfilename) . '_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) . '\',
@@ -883,7 +883,7 @@ sub adddatabase{
                \'' . $class->convert($dbminorver) . '\',
                \'' . $class->convert($dbrevisionver) . '\'
        )') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
 }
 
@@ -938,27 +938,27 @@ sub editdatabase{
 
                # Rename the tables.
 
-               $string_handle = $database_handle->prepare('RENAME TABLE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_info TO ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbnewfilename) . '_database_info, ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_pages TO ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbnewfilename) . '_database_pages');
-               $string_handle->execute();
+               $statement_handle = $database_handle->prepare('RENAME TABLE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_info TO ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbnewfilename) . '_database_info, ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_pages TO ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbnewfilename) . '_database_pages');
+               $statement_handle->execute();
 
        }
 
        # Get the current database information.
 
-       $string_handle = $database_handle->prepare('SELECT name FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbnewfilename) . '_database_info LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT name FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbnewfilename) . '_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           = decode_utf8($database_oldinfo[0]);
 
        # Update the database information.
 
-       $string_handle = $database_handle->prepare('UPDATE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbnewfilename) . '_database_info SET name = \'' . $class->convert($dbname) . '\',
+       $statement_handle = $database_handle->prepare('UPDATE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($dbnewfilename) . '_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();
 
 }
 
@@ -1005,15 +1005,15 @@ sub deletedatabase{
 
        # Delete the database tables.
 
-       $string_handle = $database_handle->prepare('DROP TABLE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($databasename) . '_database_info')  or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('DROP TABLE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($databasename) . '_database_info')  or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
        # Check if the _database_pages table exists and delete it if it exists.
 
-       $string_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($databasename) . '_database_pages\'')  or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($databasename) . '_database_pages\'')  or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@table_data = $string_handle->fetchrow_array()){
+       while (@table_data = $statement_handle->fetchrow_array()){
 
                $table_exists = 1;
 
@@ -1025,8 +1025,8 @@ sub deletedatabase{
 
                # the _database_pages table really does exist so delete it.
 
-               $string_handle = $database_handle->prepare('DROP TABLE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($databasename) . '_database_pages')  or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-               $string_handle->execute();
+               $statement_handle = $database_handle->prepare('DROP TABLE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($databasename) . '_database_pages')  or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+               $statement_handle->execute();
 
        }
 
@@ -1057,10 +1057,10 @@ sub connecttemplate{
 
        # Check if the template database exists.
 
-       $string_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_templates\'') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_templates\'') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@templatedb_check = $string_handle->fetchrow_array()){
+       while (@templatedb_check = $statement_handle->fetchrow_array()){
 
                $templatedb_exists = 1;
 
@@ -1106,14 +1106,14 @@ sub gettemplatelist{
 
        my $class = shift;
 
-       $string_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_templates ORDER BY filename ASC') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_templates ORDER BY filename ASC') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
        my @database_template;
        my @templates_list;
        my $template_filename;
 
-       while (@database_template = $string_handle->fetchrow_array()){
+       while (@database_template = $statement_handle->fetchrow_array()){
 
                # Get certain values from the array.
 
@@ -1163,10 +1163,10 @@ sub gettemplateinfo{
 
        my $filename    = $passedoptions->{"TemplateFilename"};
 
-       $string_handle = $database_handle->prepare('SELECT filename, templatename, templatedescription, templatelayout, datemodified FROM ' . $class->convert($options{"TablePrefix"}) . '_templates WHERE filename = \'' . $class->convert($filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT filename, templatename, templatedescription, templatelayout, datemodified FROM ' . $class->convert($options{"TablePrefix"}) . '_templates WHERE filename = \'' . $class->convert($filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@template_data = $string_handle->fetchrow_array()){
+       while (@template_data = $statement_handle->fetchrow_array()){
 
                # Get certain values from the array.
 
@@ -1241,10 +1241,10 @@ sub addtemplate{
 
        # Check if the template database exists.
 
-       $string_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_templates\'') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_templates\'') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@templatedb_check = $string_handle->fetchrow_array()){
+       while (@templatedb_check = $statement_handle->fetchrow_array()){
 
                $templatedb_exists = 1;
 
@@ -1255,14 +1255,14 @@ sub addtemplate{
 
        if (!$templatedb_exists){
 
-               $string_handle = $database_handle->prepare('CREATE TABLE ' . $class->convert($options{"TablePrefix"}) . '_templates (
+               $statement_handle = $database_handle->prepare('CREATE TABLE ' . $class->convert($options{"TablePrefix"}) . '_templates (
                        filename varchar(256) primary key,
                        templatename varchar(512),
                        templatedescription varchar(512),
                        templatelayout mediumtext,
                        datemodified datetime
                ) DEFAULT CHARSET=utf8') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
-               $string_handle->execute();
+               $statement_handle->execute();
 
        }
 
@@ -1270,13 +1270,13 @@ sub addtemplate{
 
        if (!$templatedb_exists){
 
-               $string_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ($blankfile = 1);
+               $statement_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ($blankfile = 1);
 
                if ($blankfile eq 0){
 
-                       $string_handle->execute();
+                       $statement_handle->execute();
 
-                       while (@page_exists = $string_handle->fetchrow_array()){
+                       while (@page_exists = $statement_handle->fetchrow_array()){
 
                                $error = "TemplatePageExists";
                                return;
@@ -1314,14 +1314,14 @@ sub addtemplate{
 
        }
 
-       $string_handle = $database_handle->prepare('INSERT INTO ' . $class->convert($options{"TablePrefix"}) . '_templates (filename, templatename, templatedescription, templatelayout, datemodified) VALUES(
+       $statement_handle = $database_handle->prepare('INSERT INTO ' . $class->convert($options{"TablePrefix"}) . '_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 = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
 }
 
@@ -1359,10 +1359,10 @@ sub edittemplate{
 
        # Check if the template exists.
 
-       $string_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@template_info = $string_handle->fetchrow_array()){
+       while (@template_info = $statement_handle->fetchrow_array()){
 
                $template_found = 1;
 
@@ -1385,7 +1385,7 @@ sub edittemplate{
 
        # Update the template information.
 
-       $string_handle = $database_handle->prepare('UPDATE ' . $class->convert($options{"TablePrefix"}) . '_templates SET
+       $statement_handle = $database_handle->prepare('UPDATE ' . $class->convert($options{"TablePrefix"}) . '_templates SET
                filename = \'' . $class->convert($new_template_filename) . '\',
                templatename = \'' . $class->convert($new_template_name) . '\',
                templatedescription = \'' . $class->convert($new_template_description) . '\',
@@ -1393,7 +1393,7 @@ sub edittemplate{
                datemodified = \'' . $class->convert($templatenewdate) . '\'
                WHERE filename = \'' . $class->convert($template_filename) . '\'
        ') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
 }
 
@@ -1424,10 +1424,10 @@ sub deletetemplate{
 
        # Check if the template exists.
 
-       $string_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_templates WHERE filename = \'' . $class->convert($template_filename) . '\' LIMIT 1') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@pagedata = $string_handle->fetchrow_array()){
+       while (@pagedata = $statement_handle->fetchrow_array()){
 
                $template_count++;
 
@@ -1444,8 +1444,8 @@ sub deletetemplate{
 
        # Delete the template from the template database.
 
-       $string_handle = $database_handle->prepare('DELETE FROM ' . $class->convert($options{"TablePrefix"}) . '_templates WHERE filename = \'' . $class->convert($template_filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('DELETE FROM ' . $class->convert($options{"TablePrefix"}) . '_templates WHERE filename = \'' . $class->convert($template_filename) . '\'') or ( $error = "TemplateDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
 }
 
@@ -1467,15 +1467,15 @@ sub getpagelist{
 
        my $class       = shift;
        
-       $string_handle  = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_pages') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle       = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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.
 
@@ -1498,6 +1498,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 = "";
@@ -1514,42 +1516,76 @@ 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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       if ($page_reduced eq 1){
 
-       # Check if the page exists in the database.
+               $statement_handle       = $database_handle->prepare('SELECT filename, pagename, pagedescription, lastmodified FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+               $statement_handle->execute();
 
-       while (@data_page = $string_handle->fetchrow_array()){
+               # Check if the page exists in the database.
 
-               # Get the values from the array.
+               while (@data_page = $statement_handle->fetchrow_array()){
 
-               $pagefilename           = decode_utf8($data_page[0]);
-               $pagename               = decode_utf8($data_page[1]);
-               $pagedescription        = decode_utf8($data_page[2]);
-               $pagesection            = decode_utf8($data_page[3]);
-               $pagetemplate           = decode_utf8($data_page[4]);
-               $pagedata               = decode_utf8($data_page[5]);
-               $pagesettings           = decode_utf8($data_page[6]);
-               $pagelastmodified       = decode_utf8($data_page[7]);
+                       # Get the values from the array.
 
-               # Put the values into the page hash.
+                       $pagefilename           = decode_utf8($data_page[0]);
+                       $pagename               = decode_utf8($data_page[1]);
+                       $pagedescription        = decode_utf8($data_page[2]);
+                       $pagelastmodified       = decode_utf8($data_page[3]);
 
-               %database_page = (
-                       "PageFilename"          => $pagefilename,
-                       "PageName"              => $pagename,
-                       "PageDescription"       => $pagedescription,
-                       "PageSection"           => $pagesection,
-                       "PageTemplate"          => $pagetemplate,
-                       "PageContent"           => $pagedata,
-                       "PageSettings"          => $pagesettings,
-                       "PageLastModified"      => $class->dateconvert($pagelastmodified),
-               );
+                       # Put the values into the page hash.
 
-               $page_found = 1;
+                       %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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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           = decode_utf8($data_page[0]);
+                       $pagename               = decode_utf8($data_page[1]);
+                       $pagedescription        = decode_utf8($data_page[2]);
+                       $pagesection            = decode_utf8($data_page[3]);
+                       $pagetemplate           = decode_utf8($data_page[4]);
+                       $pagedata               = decode_utf8($data_page[5]);
+                       $pagesettings           = decode_utf8($data_page[6]);
+                       $pagelastmodified       = decode_utf8($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;
+
+               }
+
+       }
+
        # Check if the page did exist.
 
        if (!$page_found){
@@ -1607,13 +1643,13 @@ sub addpage{
        # Check to see if the filename given already exists
        # in the page database.
 
-       $string_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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.
 
@@ -1661,7 +1697,7 @@ sub addpage{
 
        # Add the page to the selected database.
 
-       $string_handle = $database_handle->prepare('INSERT INTO ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES (
+       $statement_handle = $database_handle->prepare('INSERT INTO ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES (
                \'' . $class->convert($page_filename) . '\',
                \'' . $class->convert($page_name) . '\',
                \'' . $class->convert($page_description) . '\',
@@ -1671,7 +1707,7 @@ sub addpage{
                \'' . $class->convert($page_settings) . '\',
                \'' . $class->convert($page_date) . '\'
        )') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
 }
 
@@ -1704,10 +1740,10 @@ sub deletepage{
 
        # Check if the page exists before deleting it.
 
-       $string_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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;
 
@@ -1724,8 +1760,8 @@ sub deletepage{
 
        # Delete the page.
 
-       $string_handle = $database_handle->prepare('DELETE FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\'') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
 }
 
@@ -1772,12 +1808,12 @@ sub editpage{
 
        # Check if the page with the filename given exists.
 
-       $string_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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.
 
@@ -1797,14 +1833,16 @@ 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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_pages WHERE filename = \'' . $class->convert($page_newfilename) . '\' LIMIT 1') or ( $error = "DatabaseError", $errorext = $database_handle->errstr, return );
-               $string_handle->execute();
+               $statement_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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 = $string_handle->fetchrow_array()){
+               while (@page_info = $statement_handle->fetchrow_array()){
 
                        # The page information is found.
 
@@ -1828,8 +1866,8 @@ sub editpage{
 
        # Edit the selected page.
 
-       $string_handle = $database_handle->prepare('UPDATE ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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();
 
 }
 
@@ -1865,12 +1903,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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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.
 
@@ -1917,10 +1955,10 @@ sub movepage{
        $page_found = 0;
        @page_info = ();
 
-       $string_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($second_database_filename) . '_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($second_database_filename) . '_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $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;
 
@@ -1937,7 +1975,7 @@ sub movepage{
 
        # Add the page to the new database.
 
-       $string_handle = $database_handle->prepare('INSERT INTO ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($second_database_filename) . '_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES (
+       $statement_handle = $database_handle->prepare('INSERT INTO ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($second_database_filename) . '_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"}) . '\',
@@ -1947,12 +1985,12 @@ sub movepage{
                \'' . $class->convert($database_page{"PageSettings"}) . '\',
                \'' . $class->convert($database_page{"PageLastModified"}) . '\'
        )') or ( $error = "NewDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
        # Delete the page from the old database.
 
-       $string_handle = $database_handle->prepare('DELETE FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_database_pages WHERE filename = \'' . $class->convert($database_page{"PageFilename"}) . '\'') or ( $error = "OldDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
 }
 
@@ -1988,12 +2026,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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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 ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($database_filename) . '_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.
 
@@ -2040,10 +2078,10 @@ sub copypage{
        $page_found = 0;
        @page_info = ();
 
-       $string_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($second_database_filename) . '_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT filename FROM ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($second_database_filename) . '_database_pages WHERE filename = \'' . $class->convert($page_filename) . '\' LIMIT 1') or ( $error = "NewDatabaseError", $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;
 
@@ -2060,7 +2098,7 @@ sub copypage{
 
        # Add the page to the new database.
 
-       $string_handle = $database_handle->prepare('INSERT INTO ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($second_database_filename) . '_database_pages (filename, pagename, pagedescription, pagesection, pagetemplate, pagedata, pagesettings, lastmodified) VALUES (
+       $statement_handle = $database_handle->prepare('INSERT INTO ' . $class->convert($options{"TablePrefix"}) . '_' . $class->convert($second_database_filename) . '_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"}) . '\',
@@ -2070,7 +2108,7 @@ sub copypage{
                \'' . $class->convert($database_page{"PageSettings"}) . '\',
                \'' . $class->convert($database_page{"PageLastModified"}) . '\'
        )') or ( $error = "NewDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
 }
 
@@ -2099,10 +2137,10 @@ sub connectfilter{
 
        # Check if the template database exists.
 
-       $string_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_filters\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_filters\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@filterdb_check = $string_handle->fetchrow_array()){
+       while (@filterdb_check = $statement_handle->fetchrow_array()){
 
                $filterdb_exists = 1;
 
@@ -2153,10 +2191,10 @@ sub getfilterlist{
 
        # Get the list of filters available.
 
-       $string_handle  = $database_handle->prepare('SELECT id, priority FROM ' . $class->convert($options{"TablePrefix"}) . '_filters ORDER BY priority ASC') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle       = $database_handle->prepare('SELECT id, priority FROM ' . $class->convert($options{"TablePrefix"}) . '_filters ORDER BY priority ASC') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@filter_data = $string_handle->fetchrow_array()){
+       while (@filter_data = $statement_handle->fetchrow_array()){
 
                # Add the filter to the list of available filters.
 
@@ -2197,12 +2235,12 @@ sub getfilterinfo{
 
        my $filter_id           = $passedoptions->{"FilterID"};
 
-       $string_handle = $database_handle->prepare('SELECT id, priority, findsetting, replacesetting, notes FROM ' . $class->convert($options{"TablePrefix"}) . '_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT id, priority, findsetting, replacesetting, notes FROM ' . $class->convert($options{"TablePrefix"}) . '_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
        # Get the filter information.
 
-       while (@filter_data = $string_handle->fetchrow_array()){
+       while (@filter_data = $statement_handle->fetchrow_array()){
 
                $filter_info{"FilterID"}        = decode_utf8($filter_data[0]);
                $filter_info{"FilterPriority"}  = decode_utf8($filter_data[1]);
@@ -2278,10 +2316,10 @@ sub addfilter{
 
        # Check if the template database exists.
 
-       $string_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_filters\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SHOW TABLES LIKE \'' . $class->convert($options{"TablePrefix"}) . '_filters\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@filterdb_check = $string_handle->fetchrow_array()){
+       while (@filterdb_check = $statement_handle->fetchrow_array()){
 
                $filterdb_exists = 1;
 
@@ -2320,23 +2358,23 @@ sub addfilter{
 
                # Create the filter database table.
 
-               $string_handle = $database_handle->prepare('CREATE TABLE ' . $class->convert($options{"TablePrefix"}) . '_filters (
+               $statement_handle = $database_handle->prepare('CREATE TABLE ' . $class->convert($options{"TablePrefix"}) . '_filters (
                        id int(7) primary key,
                        priority int(5),
                        findsetting varchar(1024),
                        replacesetting varchar(1024),
                        notes text
                ) DEFAULT CHARSET=utf8') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
-               $string_handle->execute();
+               $statement_handle->execute();
 
        }
 
        # Find the lowest filter identification number available.
 
-       $string_handle = $database_handle->prepare('SELECT id FROM ' . $class->convert($options{"TablePrefix"}) . '_filters ORDER BY id ASC') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT id FROM ' . $class->convert($options{"TablePrefix"}) . '_filters ORDER BY id ASC') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@database_filters = $string_handle->fetchrow_array()){
+       while (@database_filters = $statement_handle->fetchrow_array()){
 
                $filter_id      = decode_utf8($database_filters[0]);
 
@@ -2356,12 +2394,12 @@ sub addfilter{
 
                $new_id = $filter_id + 1;
 
-               $string_handle = $database_handle->prepare('SELECT id FROM ' . $class->convert($options{"TablePrefix"}) . '_filters WHERE id = \'' . $class->convert($new_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
-               $string_handle->execute();
+               $statement_handle = $database_handle->prepare('SELECT id FROM ' . $class->convert($options{"TablePrefix"}) . '_filters WHERE id = \'' . $class->convert($new_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
+               $statement_handle->execute();
 
                # Get the filter identification number.
 
-               while (@filterid_check = $string_handle->fetchrow_array()){
+               while (@filterid_check = $statement_handle->fetchrow_array()){
 
                        $filter_found = 1;
 
@@ -2385,11 +2423,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;
@@ -2398,14 +2436,14 @@ sub addfilter{
 
        # Add the filter to the filter database.
 
-       $string_handle = $database_handle->prepare('INSERT INTO ' . $class->convert($options{"TablePrefix"}) . '_filters (id, priority, findsetting, replacesetting, notes) VALUES (
+       $statement_handle = $database_handle->prepare('INSERT INTO ' . $class->convert($options{"TablePrefix"}) . '_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 = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle->execute();
 
 }
 
@@ -2449,12 +2487,12 @@ sub editfilter{
 
        # Check if the filter exists before editing it.
 
-       $string_handle = $database_handle->prepare('SELECT id FROM ' . $class->convert($options{"TablePrefix"}) . '_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT id FROM ' . $class->convert($options{"TablePrefix"}) . '_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
        # Check if the filter exists.
 
-       while (@filter_data = $string_handle->fetchrow_array()){
+       while (@filter_data = $statement_handle->fetchrow_array()){
 
                $filter_exists = 1;
 
@@ -2474,13 +2512,13 @@ sub editfilter{
 
        # Edit the selected filter.
 
-       $string_handle = $database_handle->prepare('UPDATE ' . $class->convert($options{"TablePrefix"}) . '_filters SET
+       $statement_handle = $database_handle->prepare('UPDATE ' . $class->convert($options{"TablePrefix"}) . '_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 = $database_handle->errstr, return );       
-       $string_handle->execute();
+       $statement_handle->execute();
 
        return;
 
@@ -2516,10 +2554,10 @@ sub deletefilter{
 
        # Check if the filter exists before deleting.
 
-       $string_handle = $database_handle->prepare('SELECT id FROM ' . $class->convert($options{"TablePrefix"}) . '_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('SELECT id FROM ' . $class->convert($options{"TablePrefix"}) . '_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
-       while (@filter_data = $string_handle->fetchrow_array()){
+       while (@filter_data = $statement_handle->fetchrow_array()){
 
                $filter_exists = 1;
 
@@ -2536,8 +2574,8 @@ sub deletefilter{
 
        # Delete the filter from the filter database.
 
-       $string_handle = $database_handle->prepare('DELETE FROM ' . $class->convert($options{"TablePrefix"}) . '_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
-       $string_handle->execute();
+       $statement_handle = $database_handle->prepare('DELETE FROM ' . $class->convert($options{"TablePrefix"}) . '_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
+       $statement_handle->execute();
 
 }