Commit of recent work in preperation for Kiriwrite 0.5.0

[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 6b4bcf3..5c1e5d9 100644 (file)
--- a/cgi-files/Modules/Database/MySQL5.pm
+++ b/cgi-files/Modules/Database/MySQL5.pm
@@ -21,7 +21,7 @@
 
 # Define the package (perl module) name.
 
-package Kiriwrite::Database::MySQL5;
+package Modules::Database::MySQL5;
 
 # Enable strict and use warnings.
 
@@ -35,7 +35,7 @@ use DBI qw(:sql_types);
 
 # Set the following values.
 
-our $VERSION   = "0.1.0";
+our $VERSION   = "0.5.0";
 my ($options, %options);
 my $database_handle;
 my $statement_handle;
@@ -1683,6 +1683,7 @@ sub getpageinfo{
                                "PageContent"           => $pagedata,
                                "PageSettings"          => $pagesettings,
                                "PageLastModified"      => $class->dateconvert($pagelastmodified),
+                               # ADD PageLastModifiedInternal
                        );
 
                        $page_found = 1;
@@ -2389,12 +2390,12 @@ sub getfilterinfo{
 
        if ($reduced && $reduced eq 1){
 
-               $statement_handle = $database_handle->prepare('SELECT id, priority, findsetting, replacesetting FROM ' . $class->convert($options{"TablePrefix"}) . '_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
+               $statement_handle = $database_handle->prepare('SELECT id, priority, findsetting, replacesetting, enabled FROM ' . $class->convert($options{"TablePrefix"}) . '_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
                $statement_handle->execute();
 
        } else {
 
-               $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 = $database_handle->prepare('SELECT id, priority, findsetting, replacesetting, enabled, notes FROM ' . $class->convert($options{"TablePrefix"}) . '_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
                $statement_handle->execute();
 
        }
@@ -2407,7 +2408,8 @@ sub getfilterinfo{
                $filter_info{"FilterPriority"}  = decode_utf8($filter_data[1]);
                $filter_info{"FilterFind"}      = decode_utf8($filter_data[2]);
                $filter_info{"FilterReplace"}   = decode_utf8($filter_data[3]);
-               $filter_info{"FilterNotes"}     = decode_utf8($filter_data[4]);
+               $filter_info{"FilterEnabled"}   = decode_utf8($filter_data[4]);
+               $filter_info{"FilterNotes"}     = decode_utf8($filter_data[5]);
 
                $filter_exists = 1;
 
@@ -2444,6 +2446,7 @@ sub addfilter{
 # FindFilter   Specifies the find filter to add.                               #
 # ReplaceFilter        Specifies the replace filter to add.                            #
 # Priority     Specifies the filter priority to use.                           #
+# Enabled      Specifies if the filter should be enabled.                      #
 # Notes                Specifies the notes to use.                                     #
 #################################################################################
 
@@ -2473,6 +2476,7 @@ sub addfilter{
        my $filter_find         = $passedoptions->{"FindFilter"};
        my $filter_replace      = $passedoptions->{"ReplaceFilter"};
        my $filter_priority     = $passedoptions->{"Priority"};
+       my $filter_enabled      = $passedoptions->{"Enabled"};
        my $filter_notes        = $passedoptions->{"Notes"};
 
        # Check if the template database exists.
@@ -2513,6 +2517,12 @@ sub addfilter{
 
        }
 
+       if (!$filter_enabled){
+
+               $filter_enabled = "";
+
+       }
+
        # Check if there is really no filter table.
 
        if (!$filterdb_exists){
@@ -2524,6 +2534,7 @@ sub addfilter{
                        priority int(5),
                        findsetting varchar(1024),
                        replacesetting varchar(1024),
+                       enabled varchar(3),
                        notes text
                ) DEFAULT CHARSET=utf8') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );
                $statement_handle->execute();
@@ -2623,6 +2634,7 @@ sub editfilter{
 # NewFindFilter                Specifies the new find filter setting.                  #
 # NewReplaceFilter     Specifies the new replace filter setting.               #
 # NewFilterPriority    Specifies the new filter priority setting.              #
+# NewEnabled           Specifies if the filter is enabled.                     #
 # NewFilterNotes       Specifies the new notes for the filter.                 #
 #################################################################################
 
@@ -2644,6 +2656,7 @@ sub editfilter{
        my $filter_newfind      = $passedoptions->{"NewFindFilter"};
        my $filter_newreplace   = $passedoptions->{"NewReplaceFilter"};
        my $filter_newpriority  = $passedoptions->{"NewFilterPriority"};
+       my $filter_enabled      = $passedoptions->{"NewEnabled"};
        my $filter_newnotes     = $passedoptions->{"NewFilterNotes"};
 
        # Check if the filter exists before editing it.
@@ -2677,6 +2690,7 @@ sub editfilter{
                findsetting = \'' . $class->convert($filter_newfind) . '\',
                replacesetting = \'' . $class->convert($filter_newreplace) . '\',
                priority = \'' . $class->convert($filter_newpriority) . '\',
+               enabled = \'' . $class->convert($filter_enabled) . '\',
                notes = \'' . $class->convert($filter_newnotes) . '\'
        WHERE id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $database_handle->errstr, return );       
        $statement_handle->execute();