Merge pull request #25 from netniV/develop

Fix column name for private_key_path

Author: cigamit

INFO

@@ -1,6 +1,6 @@
 [info]
-name = export
-version = 1.4
+name = gexport
+version = 1.4.1
 longname = Graph Export Package for Cacti
 author = The Cacti Group
 email = 

README.md

@@ -27,6 +27,10 @@ If you figure out this problem, see the Cacti forums!
 Got any ideas or complaints, please create an issue in GitHub.
 
 ## Changelog
+
+--- 1.4.1 --
+* issue: Corrects column naming issue introduced in 1.4
+
 --- 1.4 ---
 * feature: Added option to clear final directory
 * feature: Added option to disable thumbnail creation

setup.php

@@ -80,22 +80,18 @@ function gexport_check_upgrade() {
 	$current = $info['version'];
 	$old     = db_fetch_cell("SELECT version FROM plugin_config WHERE directory='gexport'");
 
-	if ($current != $old) {
+	if (cacti_version_compare($old,$current,'<')) {
 		if (api_plugin_is_enabled('gexport')) {
 			# may sound ridiculous, but enables new hooks
 			api_plugin_enable_hooks('gexport');
 		}
 
-		db_execute("UPDATE plugin_config
-			SET version='$current'
-			WHERE directory='gexport'");
-
-		db_execute("UPDATE plugin_config SET
-			version='" . $info['version']  . "',
-			name='"    . $info['longname'] . "',
-			author='"  . $info['author']   . "',
-			webpage='" . $info['homepage'] . "'
-			WHERE directory='" . $info['name'] . "' ");
+		if (cacti_version_compare($old,'1.4.1', '<')) {
+			if (db_column_exists('graph_exports','export_index_key_path')) {
+				db_execute('ALTER TABLE graph_exports
+					CHANGE COLUMN `export_index_key_path` `export_private_key_path` varchar(255)');
+			}
+		}
 
 		if (cacti_version_compare($old,'1.4','<')) {
 			gexport_create_table_tasks();
@@ -140,6 +136,17 @@ function gexport_check_upgrade() {
 			db_execute('ALTER TABLE graph_exports
 				MODIFY column export_user VARCHAR(40) DEFAULT \'\'');
 		}
+
+		db_execute("UPDATE plugin_config
+			SET version='$current'
+			WHERE directory='gexport'");
+
+		db_execute("UPDATE plugin_config SET
+			version='" . $info['version']  . "',
+			name='"    . $info['longname'] . "',
+			author='"  . $info['author']   . "',
+			webpage='" . $info['homepage'] . "'
+			WHERE directory='" . $info['name'] . "' ");
 	}
 }
 
@@ -192,7 +199,7 @@ function gexport_create_table() {
 			`export_passive` char(3) DEFAULT '',
 			`export_user` varchar(40) DEFAULT '',
 			`export_password` varchar(64) DEFAULT '',
-			`export_private_index_path` varchar(255) DEFAULT '',
+			`export_private_key_path` varchar(255) DEFAULT '',
 			`status` int(10) unsigned DEFAULT '0',
 			`export_pid` int(10) unsigned DEFAULT NULL,
 			`next_start` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',