From 92c2c4ce30930d23b7c09c18fa188b4859fda748 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Wed, 31 Dec 2014 10:33:05 -0600 Subject: [PATCH 1/4] Update db_template.txt logcon_users.last_login was specified as NOT NULL but no DEFAULT value was set. This was preventing initial admin user from being created during install even though success message was reported. --- src/include/db_template.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/db_template.txt b/src/include/db_template.txt index 7d18128..4aa5f6c 100644 --- a/src/include/db_template.txt +++ b/src/include/db_template.txt @@ -98,7 +98,7 @@ CREATE TABLE IF NOT EXISTS `logcon_users` ( `password` varchar(32) NOT NULL, `is_admin` tinyint(1) NOT NULL default '0', `is_readonly` tinyint(1) NOT NULL DEFAULT '0', - `last_login` int(4) NOT NULL, + `last_login` int(4) NOT NULL DEFAULT '0', PRIMARY KEY (`ID`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Table for the phplogcon users' AUTO_INCREMENT=1 ; From 0bd53f19d81ba9093f3c8b54447c772321e1d79a Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Wed, 31 Dec 2014 10:34:05 -0600 Subject: [PATCH 2/4] Update db_template.txt added DROP TABLE IF EXISTS for logcon_savedreports to match the rest of the tables --- src/include/db_template.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/include/db_template.txt b/src/include/db_template.txt index 4aa5f6c..baa6273 100644 --- a/src/include/db_template.txt +++ b/src/include/db_template.txt @@ -170,6 +170,8 @@ CREATE TABLE `logcon_dbmappings` ( -- -- Table structure for table `logcon_savedreports` -- + +DROP TABLE IF EXISTS `logcon_savedreports`; CREATE TABLE `logcon_savedreports` ( `ID` int(11) NOT NULL auto_increment, `reportid` varchar(255) NOT NULL, From 26c9f1a7674cd2a93cce650d3d4c02986f91861e Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Wed, 31 Dec 2014 15:05:13 -0600 Subject: [PATCH 3/4] Update admin.php added missing Delete Database Mapping entry --- src/lang/en/admin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lang/en/admin.php b/src/lang/en/admin.php index cd4421a..ef55fd8 100644 --- a/src/lang/en/admin.php +++ b/src/lang/en/admin.php @@ -232,6 +232,7 @@ $content['LN_DBMP_NAME'] = "Database Mappingname"; $content['LN_DBMP_DBMAPPINGS'] = "Database Mappings"; $content['LN_DBMP_ADD'] = "Add new Database Mapping"; $content['LN_DBMP_EDIT'] = "Edit Database Mapping"; +$content['LN_DBMP_DELETE'] = "Delete Database Mapping"; $content['LN_DBMP_ERROR_IDNOTFOUND'] = "A Database Mapping with ID '%1' could not be found."; $content['LN_DBMP_ERROR_INVALIDID'] = "The Database Mapping with ID '%1' is not a valid Database Mapping."; $content['LN_DBMP_WARNDELETEMAPPING'] = "Are you sure that you want to delete the Database Mapping '%1'? This cannot be undone!"; @@ -491,4 +492,4 @@ $content['LN_REPORTS_ERROR_FAILED_SOURCE_CHECK'] = "Failed to check the datasour $content['LN_REPORTS_'] = ""; -?> \ No newline at end of file +?> From dab6dbb75895c457e0c2602f220a04615af4e082 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Wed, 31 Dec 2014 15:06:12 -0600 Subject: [PATCH 4/4] Update admin.php added missing entry for Delete Database Mapping --- src/lang/de/admin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lang/de/admin.php b/src/lang/de/admin.php index 816610b..bb08a92 100644 --- a/src/lang/de/admin.php +++ b/src/lang/de/admin.php @@ -229,6 +229,7 @@ $content['LN_DBMP_NAME'] = "Database Mappingname"; $content['LN_DBMP_DBMAPPINGS'] = "Database Mappings"; $content['LN_DBMP_ADD'] = "Add new Database Mapping"; $content['LN_DBMP_EDIT'] = "Edit Database Mapping"; +$content['LN_DBMP_DELETE'] = "Delete Database Mapping"; $content['LN_DBMP_ERROR_IDNOTFOUND'] = "A Database Mapping with ID '%1' could not be found."; $content['LN_DBMP_ERROR_INVALIDID'] = "The Database Mapping with ID '%1' is not a valid Database Mapping."; $content['LN_DBMP_WARNDELETEMAPPING'] = "Are you sure that you want to delete the Database Mapping '%1'? This cannot be undone!"; @@ -476,4 +477,4 @@ $content['LN_REPORTS_ADDSAVEDREPORTANDRETURN'] = "Add Savedreport and return to $content['LN_REPORTS_EDITSAVEDREPORTANDRETURN'] = "Save changes and return to reportlist"; $content['LN_REPORTS_'] = ""; -?> \ No newline at end of file +?>