Releasing 2.1 to be compatible with Cacti 1.1.17 and above

Also, properly upgrade the flowview plguin.

Author: cigamit

INFO

@@ -1,9 +1,9 @@
 [info]
 name = flowview
-version = 2.0
+version = 2.1
 longname = FlowView
 author = The Cacti Group
 email = 
 homepage = http://www.cacti.net
-compat = 1.1.1
+compat = 1.1.17
 capabilities = online_view:0, online_mgmt:0, offline_view:0, offline_mgmt:0, remote_collect:0

README.md

@@ -42,6 +42,9 @@ Got any ideas or complaints, please see the Cacti forums or GitHub for a resolut
 
 # Changelog
 
+--- 2.1 ---
+* issue: Prepare for sunrise theme in 1.1.17
+
 --- 2.0 ---
 * feature: Support for Cacti 1.0
 * feature: Support for Ugroup Plugin

functions.php

@@ -125,28 +125,20 @@ function flowview_display_report() {
 						<td>
 							<?php print __('Show/Hide', 'flowview');?>
 						</td>
-						<td>
+						<td class='nowrap'>
 							<input type='checkbox' name='table' id='table' <?php print (get_request_var('table') == 'true' || get_request_var('table') == 'on' ? 'checked':'');?>>
-						</td>
-						<td>
 							<label for='table'><?php print __('Table', 'flowview');?></label>
 						</td>
-						<td>
+						<td class='nowrap'>
 							<input type='checkbox' name='bytes' id='bytes' <?php print (get_request_var('bytes') == 'true' || get_request_var('bytes') == 'on' ? 'checked':'');?>>
-						</td>
-						<td>
 							<label for='bytes'><?php print __('Bytes Bar', 'flowview');?></label>
 						</td>
-						<td>
+						<td class='nowrap'>
 							<input type='checkbox' name='packets' id='packets' <?php print (get_request_var('packets') == 'true' || get_request_var('packets') == 'on' ? 'checked':'');?>>
-						</td>
-						<td>
 							<label for='packets'><?php print __('Packets Bar', 'flowview');?></label>
 						</td>
-						<td>
+						<td class='nowrap'>
 							<input type='checkbox' name='flows' id='flows' <?php print (get_request_var('flows') == 'true' || get_request_var('flows') == 'on' ? 'checked':'');?>>
-						</td>
-						<td>
 							<label for='flows'><?php print __('Flows Bar', 'flowview');?></label>
 						</td>
 						<td>

setup.php

@@ -55,22 +55,41 @@ function plugin_flowview_upgrade() {
 }
 
 function plugin_flowview_check_upgrade() {
-	$current = plugin_flowview_version();
-	$current = $current['version'];
-	$old = read_config_option('plugin_flowview_version');
-	if ($current != $old) {
-		flowview_setup_table();
-	}else{
+	$files = array('plugins.php', 'flowview.php', 'index.php');
+	if (isset($_SERVER['PHP_SELF']) && !in_array(basename($_SERVER['PHP_SELF']), $files)) {
 		return;
 	}
 
-	/* update titles for those that don't have them */
-	db_execute("UPDATE plugin_flowview_schedules SET title='Ugraded Schedule' WHERE title=''");
+	$info    = plugin_flowview_version();
+	$current = $info['version'];
+	$old     = read_config_option('plugin_flowview_version');
+
+	if ($current != $old) {
+		$bad_titles = db_fetch_cell('SELECT COUNT(*)
+			FROM plugin_flowview_schedules
+			WHERE title=""');
+
+		if ($bad_titles) {
+			/* update titles for those that don't have them */
+			db_execute("UPDATE plugin_flowview_schedules SET title='Ugraded Schedule' WHERE title=''");
+
+			/* Set the new version */
+			db_execute_prepared("REPLACE INTO settings (name, value) VALUES ('plugin_flowview_version', ?)", array($current));
 
-	/* Set the new version */
-	db_execute_prepared("REPLACE INTO settings (name, value) VALUES ('plugin_flowview_version', ?)", array($current));
+			db_execute('ALTER TABLE plugin_flowview_devices ENGINE=InnoDB');
+		}
+
+		db_execute("UPDATE plugin_config
+			SET version='$current'
+			WHERE directory='flowview'");
 
-	db_execute('ALTER TABLE plugin_flowview_devices ENGINE=InnoDB');
+		db_execute("UPDATE plugin_config SET
+			version='" . $info['version']  . "',
+			name='"    . $info['longname'] . "',
+			author='"  . $info['author']   . "',
+			webpage='" . $info['homepage'] . "'
+			WHERE directory='" . $info['name'] . "' ");
+	}
 }
 
 function plugin_flowview_version() {
@@ -84,6 +103,8 @@ function flowview_config_arrays() {
 
 	$messages['flow_deleted'] = array('message' => __('The Filter has been Deleted', 'flowview'), 'type' => 'info');
 	$messages['flow_updated'] = array('message' => __('The Filter has been Updated', 'flowview'), 'type' => 'info');
+
+	plugin_flowview_check_upgrade();
 }
 
 function flowview_draw_navigation_text($nav) {