X-Git-Url: http://Server1/repobrowser/?p=kiriwrite%2F.git;a=blobdiff_plain;f=cgi-files%2FModules%2FDatabase%2FSQLite.pm;h=6fc34b4e21ad3d8f5ae6288f84a16fcf59b25672;hp=2fea5a0aacd361722d108b8935779351fdfc618a;hb=807fbc25c35ea3cdf16adcb2106fbb63b3511a68;hpb=aee5e67f9791c7be0f258e1491b2ee8f323bf04b

diff --git a/cgi-files/Modules/Database/SQLite.pm b/cgi-files/Modules/Database/SQLite.pm
index 2fea5a0..6fc34b4 100644
--- a/cgi-files/Modules/Database/SQLite.pm
+++ b/cgi-files/Modules/Database/SQLite.pm
@@ -21,10 +21,11 @@
 
 # Define the package (perl module) name.
 
-package Kiriwrite::Database::SQLite;
+package Modules::Database::SQLite;
 
 # Enable strict and use warnings.
 
+use Modules::System::Common;
 use strict;
 use warnings;
 
@@ -34,7 +35,7 @@ use DBI qw(:sql_types);
 
 # Set the following values.
 
-our $VERSION 	= "0.2.0";
+our $VERSION 	= "0.5.0";
 my ($options, %options);
 my $database_handle;
 my $statement_handle;
@@ -1312,14 +1313,14 @@ sub getpageinfo{
 			# 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),
+				"PageFilename" 			=> $pagefilename,
+				"PageName"			=> $pagename,
+				"PageDescription"		=> $pagedescription,
+				"PageSection"			=> $pagesection,
+				"PageTemplate"			=> $pagetemplate,
+				"PageContent"			=> $pagedata,
+				"PageSettings"			=> $pagesettings,
+				"PageLastModified"		=> $class->dateconvert($pagelastmodified)
 			);
 	
 			$page_found = 1;
@@ -1879,7 +1880,7 @@ sub connectfilter{
 
 	# Check if the template database exists.
 
-	my $filterdatabase_exists = main::kiriwrite_fileexists("filters.db.sqlite");
+	my $filterdatabase_exists = kiriwrite_fileexists("filters.db.sqlite");
 	
 	if ($filterdatabase_exists eq 1){
 
@@ -1896,7 +1897,7 @@ sub connectfilter{
 
 	# Check if the permission settings for the template database are valid.
 
-	my $filterdb_permissions = main::kiriwrite_filepermissions("filters.db.sqlite", 1, 0);
+	my $filterdb_permissions = kiriwrite_filepermissions("filters.db.sqlite", 1, 0);
 
 	if ($filterdb_permissions eq 1){
 
@@ -2054,12 +2055,12 @@ sub getfilterinfo{
 	
 	if ($reduced && $reduced eq 1){
 
-		$filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id, priority, findsetting, replacesetting FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
+		$filterdb_statement_handle = $filterdb_database_handle->prepare('SELECT id, priority, findsetting, replacesetting, enabled FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
 		$filterdb_statement_handle->execute();
 
 	} else {
 
-		$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 = $filterdb_database_handle->prepare('SELECT id, priority, findsetting, replacesetting, enabled, notes FROM kiriwrite_filters where id = \'' . $class->convert($filter_id) . '\'') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
 		$filterdb_statement_handle->execute();
 
 	}
@@ -2072,7 +2073,8 @@ sub getfilterinfo{
 		$filter_info{"FilterPriority"}	= $filter_data[1];
 		$filter_info{"FilterFind"}	= $filter_data[2];
 		$filter_info{"FilterReplace"}	= $filter_data[3];
-		$filter_info{"FilterNotes"}	= $filter_data[4];
+		$filter_info{"FilterEnabled"}	= $filter_data[4];
+		$filter_info{"FilterNotes"}	= $filter_data[5];
 
 		$filter_exists = 1;
 
@@ -2137,12 +2139,13 @@ 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 filter database permissions are valid.
 
-	my $filterdb_exists = main::kiriwrite_fileexists("filters.db.sqlite", 1, 1);
-	my $filterdb_permissions = main::kiriwrite_filepermissions("filters.db.sqlite", 1, 1);
+	my $filterdb_exists = kiriwrite_fileexists("filters.db.sqlite", 1, 1);
+	my $filterdb_permissions = kiriwrite_filepermissions("filters.db.sqlite", 1, 1);
 
 	if ($filterdb_permissions eq 1){
 
@@ -2180,7 +2183,13 @@ sub addfilter{
 
 	}
 
-	my $directory_permissions = main::kiriwrite_filepermissions(".", 1, 1, 0);
+	if (!$filter_enabled){
+
+		$filter_enabled = "";
+
+	}
+
+	my $directory_permissions = kiriwrite_filepermissions(".", 1, 1, 0);
 
 	if ($directory_permissions eq 1 && $filterdb_exists){
 
@@ -2207,6 +2216,7 @@ sub addfilter{
         		priority int(5),
         		findsetting varchar(1024),
         		replacesetting varchar(1024),
+			enabled boolean,
         		notes text
 		)') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
 		$filterdb_statement_handle->execute();
@@ -2280,11 +2290,12 @@ sub addfilter{
 
 	# Add the filter to the filter database.
 
-	$filterdb_statement_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, enabled, notes) VALUES (
 		\'' . $class->convert($new_id) . '\',
 		\'' . $class->convert($filter_priority) . '\',
 		\'' . $class->convert($filter_find) . '\',
 		\'' . $class->convert($filter_replace) .'\',
+		\'' . $class->convert($filter_enabled) . '\',
 		\'' . $class->convert($filter_notes) . '\'
 	)') or ( $error = "FilterDatabaseError", $errorext = $filterdb_database_handle->errstr, return );
 	$filterdb_statement_handle->execute();
@@ -2305,6 +2316,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 should be enabled.		#
 # NewFilterNotes	Specifies the new notes for the filter.			#
 #################################################################################
 
@@ -2326,12 +2338,13 @@ 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 database permissions are valid.
 
-	my $filterdb_exists = main::kiriwrite_fileexists("filters.db.sqlite", 1, 1);
-	my $filterdb_permissions = main::kiriwrite_filepermissions("filters.db.sqlite", 1, 1);
+	my $filterdb_exists = kiriwrite_fileexists("filters.db.sqlite", 1, 1);
+	my $filterdb_permissions = kiriwrite_filepermissions("filters.db.sqlite", 1, 1);
 
 	if ($filterdb_permissions eq 1){
 
@@ -2373,6 +2386,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 = $filterdb_database_handle->errstr, return );	
 	$filterdb_statement_handle->execute();
@@ -2462,7 +2476,7 @@ sub connecttemplate{
 
 	# Check if the template database exists.
 
-	my $templatedatabase_exists = main::kiriwrite_fileexists("templates.db.sqlite");
+	my $templatedatabase_exists = kiriwrite_fileexists("templates.db.sqlite");
 	
 	if ($templatedatabase_exists eq 1){
 
@@ -2479,7 +2493,7 @@ sub connecttemplate{
 
 	# Check if the permission settings for the template database are valid.
 
-	my $templatedb_permissions = main::kiriwrite_filepermissions("templates.db.sqlite", 1, 0);
+	my $templatedb_permissions = kiriwrite_filepermissions("templates.db.sqlite", 1, 0);
 
 	if ($templatedb_permissions eq 1){
 
@@ -2729,8 +2743,8 @@ sub addtemplate{
 
 	# Check if the template database permissions are valid.
 
-	my $templatedb_exists = main::kiriwrite_fileexists("templates.db.sqlite", 1, 1);
-	my $templatedb_permissions = main::kiriwrite_filepermissions("templates.db.sqlite", 1, 1);
+	my $templatedb_exists = kiriwrite_fileexists("templates.db.sqlite", 1, 1);
+	my $templatedb_permissions = kiriwrite_filepermissions("templates.db.sqlite", 1, 1);
 
 	if ($templatedb_permissions eq 1){
 
@@ -2789,7 +2803,7 @@ sub addtemplate{
 
 	}
 
-	my $directory_permissions = main::kiriwrite_filepermissions(".", 1, 1, 0);
+	my $directory_permissions = kiriwrite_filepermissions(".", 1, 1, 0);
 
 	if ($directory_permissions eq 1 && $templatedb_exists){
 
@@ -2823,7 +2837,7 @@ sub addtemplate{
 
 		# Create a template table.
 
-		my $directory_permissions = main::kiriwrite_filepermissions(".", 1, 1, 0);
+		my $directory_permissions = kiriwrite_filepermissions(".", 1, 1, 0);
 
 		if ($directory_permissions eq 1){
 
@@ -2943,8 +2957,8 @@ sub edittemplate{
 
 	# Check if the template database permissions are valid.
 
-	my $templatedb_exists = main::kiriwrite_fileexists("templates.db.sqlite", 1, 1);
-	my $templatedb_permissions = main::kiriwrite_filepermissions("templates.db.sqlite", 1, 1);
+	my $templatedb_exists = kiriwrite_fileexists("templates.db.sqlite", 1, 1);
+	my $templatedb_permissions = kiriwrite_filepermissions("templates.db.sqlite", 1, 1);
 
 	if ($templatedb_permissions eq 1){