weathermap

Subversion Repositories:

[/] [setup.php] - Diff between revs 13 and 85

Rev 13 Rev 85

Line 7... Line 7...

Program ........ Network Weathermap for Cacti Program ........ Network Weathermap for Cacti

Version ........ See code below Version ........ See code below

Purpose ........ Network Usage Overview Purpose ........ Network Usage Overview

*******************************************************************************/ *******************************************************************************/

// who knows why this changed... not me.

function disabled_plugin_weathermap_version()

{

return(weathermap_version());

}

function weathermap_version () { function weathermap_version () {

return array( 'name' => 'weathermap', return array( 'name' => 'weathermap',

'version' => '0.92', 'version' => '0.97a',

'longname' => 'PHP Network Weathermap', 'longname' => 'PHP Network Weathermap',

'author' => 'Howard Jones', 'author' => 'Howard Jones',

'homepage' => 'http://wotsit.thingy.com/haj/cacti/php-weathermap/', 'homepage' => 'http://www.network-weathermap.com/',

'webpage' => 'http://www.network-weathermap.com/',

'email' => 'howie@thingy.com', 'email' => 'howie@thingy.com',

'url' => 'http://wotsit.thingy.com/haj/cacti/versions.php' 'url' => 'http://www.network-weathermap.com/versions.php'

); );

} }

function disabled_plugin_weathermap_uninstall() {

// doesn't really do anything. Here to remind me.

// not sure what it should really do.

}

function disabled_plugin_weathermap_check_config() {

// doesn't really do anything either because it's not implemented yet in PIA. Would be handy if it was.

if(!function_exists("imagecreate")) return FALSE;

if(!function_exists("preg_match")) return FALSE;

if(!function_exists("imagecreatetruecolor")) return FALSE;

if(!function_exists("imagecreatefrompng")) return FALSE;

if(!function_exists("imagepng")) return FALSE;

if(!function_exists("imageSaveAlpha")) return FALSE;

if(!function_exists("imagealphablending")) return FALSE;

// if(!function_exists("imagecopyresampled")) return FALSE;

return TRUE;

}

function disabled_plugin_weathermap_install () {

api_plugin_register_hook('weathermap', 'config_arrays', 'weathermap_config_arrays', 'setup.php');

api_plugin_register_hook('weathermap', 'draw_navigation_text', 'weathermap_draw_navigation_text', 'setup.php');

api_plugin_register_hook('weathermap', 'config_settings', 'weathermap_config_settings', 'setup.php');

api_plugin_register_hook('weathermap', 'top_header_tabs', 'weathermap_show_tab', 'setup.php');

api_plugin_register_hook('weathermap', 'top_graph_header_tabs', 'weathermap_show_tab', 'setup.php');

api_plugin_register_hook('weathermap', 'poller_bottom', 'weathermap_poller_bottom', 'setup.php');

api_plugin_register_hook('weathermap', 'poller_top', 'weathermap_poller_top', 'setup.php');

api_plugin_register_hook('weathermap', 'poller_output', 'weathermap_poller_output', 'setup.php');

api_plugin_register_hook('weathermap', 'top_graph_refresh', 'weathermap_top_graph_refresh', 'setup.php');

api_plugin_register_hook('weathermap', 'page_title', 'weathermap_page_title', 'setup.php');

api_plugin_register_hook('weathermap', 'page_head', 'weathermap_page_head', 'setup.php');

weathermap_setup_table ();

}

function plugin_init_weathermap() { function plugin_init_weathermap() {

global $plugin_hooks; global $plugin_hooks;

$plugin_hooks['top_header_tabs']['weathermap'] = 'weathermap_show_tab'; $plugin_hooks['top_header_tabs']['weathermap'] = 'weathermap_show_tab';

$plugin_hooks['top_graph_header_tabs']['weathermap'] = 'weathermap_show_tab'; $plugin_hooks['top_graph_header_tabs']['weathermap'] = 'weathermap_show_tab';

$plugin_hooks['config_arrays']['weathermap'] = 'weathermap_config_arrays'; $plugin_hooks['config_arrays']['weathermap'] = 'weathermap_config_arrays';

$plugin_hooks['draw_navigation_text']['weathermap'] = 'weathermap_draw_navigation_text'; $plugin_hooks['draw_navigation_text']['weathermap'] = 'weathermap_draw_navigation_text';

$plugin_hooks['config_settings']['weathermap'] = 'weathermap_config_settings'; $plugin_hooks['config_settings']['weathermap'] = 'weathermap_config_settings';

$plugin_hooks['poller_bottom']['weathermap'] = 'weathermap_poller_bottom'; $plugin_hooks['poller_bottom']['weathermap'] = 'weathermap_poller_bottom';

$plugin_hooks['poller_top']['weathermap'] = 'weathermap_poller_top';

$plugin_hooks['poller_output']['weathermap'] = 'weathermap_poller_output';

$plugin_hooks['top_graph_refresh']['weathermap'] = 'weathermap_top_graph_refresh'; $plugin_hooks['top_graph_refresh']['weathermap'] = 'weathermap_top_graph_refresh';

$plugin_hooks['page_title']['weathermap'] = 'weathermap_page_title';

$plugin_hooks['page_head']['weathermap'] = 'weathermap_page_head';

} }

// figure out if this poller run is hitting the 'cron' entry for any maps.

function weathermap_poller_top()

{

global $weathermap_poller_start_time;

$n = time();

// round to the nearest minute, since that's all we need for the crontab-style stuff

$weathermap_poller_start_time = $n - ($n%60);

}

function weathermap_page_head()

{

global $config;

// Add in a Media RSS link on the thumbnail view

// - format isn't quite right, so it's disabled for now.

// if(preg_match('/plugins\/weathermap\/weathermap\-cacti\-plugin\.php/',$_SERVER['REQUEST_URI'] ,$matches))

// {

// print '<link id="media-rss" title="My Network Weathermaps" rel="alternate" href="?action=mrss" type="application/rss+xml">';

// }

if(preg_match('/plugins\/weathermap\//',$_SERVER['REQUEST_URI'] ,$matches))

{

print '<LINK rel="stylesheet" type="text/css" media="screen" href="weathermap-cacti-plugin.css">';

}

}

function weathermap_page_title( $t )

{

if(preg_match('/plugins\/weathermap\//',$_SERVER['REQUEST_URI'] ,$matches))

{

$t .= " - Weathermap";

if(preg_match('/plugins\/weathermap\/weathermap-cacti-plugin.php\?action=viewmap&id=([^&]+)/',$_SERVER['REQUEST_URI'],$matches))

{

$mapid = $matches[1];

if(preg_match("/^\d+$/",$mapid))

{

$title = db_fetch_cell("SELECT titlecache from weathermap_maps where ID=".intval($mapid));

}

else

{

$title = db_fetch_cell("SELECT titlecache from weathermap_maps where filehash='".mysql_real_escape_string($mapid)."'");

}

if(isset($title)) $t .= " - $title";

}

}

return($t);

}

function weathermap_top_graph_refresh($refresh) function weathermap_top_graph_refresh($refresh)

{ {

if (basename($_SERVER["PHP_SELF"]) != "weathermap-cacti-plugin.php") if (basename($_SERVER["PHP_SELF"]) != "weathermap-cacti-plugin.php")

return $refresh; return $refresh;

// if we're cycling maps, then we want to handle reloads ourselves, thanks // if we're cycling maps, then we want to handle reloads ourselves, thanks

if($_REQUEST["action"] == 'viewmapcycle') if(isset($_REQUEST["action"]) && $_REQUEST["action"] == 'viewmapcycle')

{ {

return(86400); return(86400);

} }

return ($refresh); return ($refresh);

} }

Line 58... Line 165...

), ),

"weathermap_pagestyle" => array( "weathermap_pagestyle" => array(

"friendly_name" => "Page style", "friendly_name" => "Page style",

"description" => "How to display multiple maps.", "description" => "How to display multiple maps.",

"method" => "drop_array", "method" => "drop_array",

"array" => array(0 => "Thumbnail Overview", 1 => "Full Images") "array" => array(0 => "Thumbnail Overview", 1 => "Full Images", 2 => "Show Only First")

), ),

"weathermap_thumbsize" => array( "weathermap_thumbsize" => array(

"friendly_name" => "Thumbnail Maximum Size", "friendly_name" => "Thumbnail Maximum Size",

"description" => "The maximum width or height for thumbnails in thumbnail view, in pixels. Takes effect after the next poller run.", "description" => "The maximum width or height for thumbnails in thumbnail view, in pixels. Takes effect after the next poller run.",

"method" => "textbox", "method" => "textbox",

Line 107... Line 214...

72 => 'Every 72 Poller Cycles', 72 => 'Every 72 Poller Cycles',

288 => 'Every 288 Poller Cycles', 288 => 'Every 288 Poller Cycles',

), ),

), ),

"weathermap_all_tab" => array(

"friendly_name" => "Show 'All' Tab",

"description" => "When using groups, add an 'All Maps' tab to the tab bar.",

"method" => "drop_array",

"array" => array(0=>"No (default)",1=>"Yes")

),

"weathermap_map_selector" => array(

"friendly_name" => "Show Map Selector",

"description" => "Show a combo-box map selector on the full-screen map view.",

"method" => "drop_array",

"array" => array(0=>"No",1=>"Yes (default)")

),

"weathermap_quiet_logging" => array( "weathermap_quiet_logging" => array(

"friendly_name" => "Quiet Logging", "friendly_name" => "Quiet Logging",

"description" => "By default, even in LOW level logging, Weathermap logs normal activity. This makes it REALLY log only errors in LOW mode.", "description" => "By default, even in LOW level logging, Weathermap logs normal activity. This makes it REALLY log only errors in LOW mode.",

"method" => "drop_array", "method" => "drop_array",

"array" => array(0=>"Chatty (default)",1=>"Quiet") "array" => array(0=>"Chatty (default)",1=>"Quiet")

Line 123... Line 242...

} }

function weathermap_setup_table () { function weathermap_setup_table () {

global $config, $database_default; global $config, $database_default;

global $WEATHERMAP_VERSION;

include_once($config["library_path"] . DIRECTORY_SEPARATOR . "database.php"); include_once($config["library_path"] . DIRECTORY_SEPARATOR . "database.php");

$sql = "show tables from " . $database_default; $dbversion = read_config_option("weathermap_db_version");

$result = db_fetch_assoc($sql) or die (mysql_error());

$tables = array(); $myversioninfo = weathermap_version();

$sql = array(); $myversion = $myversioninfo['version'];

// only bother with all this if it's a new install, a new version, or we're in a development version

// - saves a handful of db hits per request!

if( ($dbversion=="") || (preg_match("/dev$/",$myversion)) || ($dbversion != $myversion) )

{

# cacti_log("Doing setup_table() \n",true,"WEATHERMAP");

$sql = "show tables";

$result = db_fetch_assoc($sql) or die (mysql_error());

foreach($result as $index => $arr) { $tables = array();

foreach ($arr as $t) { $sql = array();

$tables[] = $t;

foreach($result as $index => $arr) {

foreach ($arr as $t) {

$tables[] = $t;

}

} }

}

$sql[] = "update weathermap_maps set sortorder=id where sortorder is null;"; $sql[] = "update weathermap_maps set sortorder=id where sortorder is null;";

if (!in_array('weathermap_maps', $tables)) {

$sql[] = "CREATE TABLE weathermap_maps (

id int(11) NOT NULL auto_increment,

sortorder int(11) NOT NULL default 0,

group_id int(11) NOT NULL default 1,

active set('on','off') NOT NULL default 'on',

configfile text NOT NULL,

imagefile text NOT NULL,

htmlfile text NOT NULL,

titlecache text NOT NULL,

filehash varchar (40) NOT NULL default '',

warncount int(11) NOT NULL default 0,

config text NOT NULL default '',

thumb_width int(11) NOT NULL default 0,

thumb_height int(11) NOT NULL default 0,

schedule varchar(32) NOT NULL default '*',

archiving set('on','off') NOT NULL default 'off',

PRIMARY KEY (id)

) TYPE=MyISAM;";

}

else

{

$colsql = "show columns from weathermap_maps from " . $database_default;

$result = mysql_query($colsql) or die (mysql_error());

$found_so = false; $found_fh = false;

$found_wc = false; $found_cf = false;

$found_96changes = false;

$found_96bchanges = false;

while ($row = mysql_fetch_array($result, MYSQL_ASSOC)) {

if ($row['Field'] == 'sortorder') $found_so = true;

if ($row['Field'] == 'filehash') $found_fh = true;

if ($row['Field'] == 'warncount') $found_wc = true;

if ($row['Field'] == 'config') $found_cf = true;

if ($row['Field'] == 'thumb_width') $found_96changes = true;

if ($row['Field'] == 'group_id') $found_96bchanges = true;

}

if (!$found_so) $sql[] = "alter table weathermap_maps add sortorder int(11) NOT NULL default 0 after id";

if (!$found_fh) $sql[] = "alter table weathermap_maps add filehash varchar(40) NOT NULL default '' after titlecache";

if (!$found_wc) $sql[] = "alter table weathermap_maps add warncount int(11) NOT NULL default 0 after filehash";

if (!$found_cf) $sql[] = "alter table weathermap_maps add config text NOT NULL default '' after warncount";

if (!$found_96changes)

{

$sql[] = "alter table weathermap_maps add thumb_width int(11) NOT NULL default 0 after config";

$sql[] = "alter table weathermap_maps add thumb_height int(11) NOT NULL default 0 after thumb_width";

$sql[] = "alter table weathermap_maps add schedule varchar(32) NOT NULL default '*' after thumb_height";

$sql[] = "alter table weathermap_maps add archiving set('on','off') NOT NULL default 'off' after schedule";

}

if (!$found_96bchanges)

{

$sql[] = "alter table weathermap_maps add group_id int(11) NOT NULL default 1 after sortorder";

$sql[] = "ALTER TABLE `weathermap_settings` ADD `groupid` INT NOT NULL DEFAULT '0' AFTER `mapid`";

}

}

if (!in_array('weathermap_maps', $tables)) { $sql[] = "update weathermap_maps set filehash=LEFT(MD5(concat(id,configfile,rand())),20) where filehash = '';";

$sql[] = "CREATE TABLE weathermap_maps (

id int(11) NOT NULL auto_increment, if (!in_array('weathermap_auth', $tables)) {

sortorder int(11) NOT NULL default 0, $sql[] = "CREATE TABLE weathermap_auth (

active set('on','off') NOT NULL default 'on', userid mediumint(9) NOT NULL default '0',

configfile text NOT NULL, mapid int(11) NOT NULL default '0'

imagefile text NOT NULL, ) TYPE=MyISAM;";

htmlfile text NOT NULL,

titlecache text NOT NULL,

PRIMARY KEY (id)

) TYPE=MyISAM;";

}

else

{

$colsql = "show columns from weathermap_maps from " . $database_default;

$result = mysql_query($colsql) or die (mysql_error());

$found = false;

while ($row = mysql_fetch_array($result, MYSQL_ASSOC)) {

if ($row['Field'] == 'sortorder')

$found = true;

} }

if (!$found)

if (!in_array('weathermap_groups', $tables)) {

$sql[] = "CREATE TABLE weathermap_groups (

`id` INT(11) NOT NULL auto_increment,

`name` VARCHAR( 128 ) NOT NULL default '',

`sortorder` INT(11) NOT NULL default 0,

PRIMARY KEY (id)

) TYPE=MyISAM;";

$sql[] = "INSERT INTO weathermap_groups (id,name,sortorder) VALUES (1,'Weathermaps',1)";

}

if (!in_array('weathermap_settings', $tables)) {

$sql[] = "CREATE TABLE weathermap_settings (

id int(11) NOT NULL auto_increment,

mapid int(11) NOT NULL default '0',

groupid int(11) NOT NULL default '0',

optname varchar(128) NOT NULL default '',

optvalue varchar(128) NOT NULL default '',

PRIMARY KEY (id)

) TYPE=MyISAM;";

}

if (!in_array('weathermap_data', $tables)) {

$sql[] = "CREATE TABLE IF NOT EXISTS weathermap_data (id int(11) NOT NULL auto_increment,

rrdfile varchar(255) NOT NULL,data_source_name varchar(19) NOT NULL,

last_time int(11) NOT NULL,last_value varchar(255) NOT NULL,

last_calc varchar(255) NOT NULL, sequence int(11) NOT NULL, local_data_id int(11) NOT NULL DEFAULT 0, PRIMARY KEY (id), KEY rrdfile (rrdfile),

KEY local_data_id (local_data_id), KEY data_source_name (data_source_name) ) TYPE=MyISAM";

}

else

{ {

$sql[] = "alter table weathermap_maps add sortorder int(11) NOT NULL default 0 after id"; $colsql = "show columns from weathermap_data from " . $database_default;

$result = mysql_query($colsql) or die (mysql_error());

$found_ldi = false;

while ($row = mysql_fetch_array($result, MYSQL_ASSOC)) {

if ($row['Field'] == 'local_data_id') $found_ldi = true;

}

if (!$found_ldi)

{

$sql[] = "alter table weathermap_data add local_data_id int(11) NOT NULL default 0 after sequence";

$sql[] = "alter table weathermap_data add index ( `local_data_id` )";

# if there is existing data without a local_data_id, ditch it

$sql[] = "delete from weathermap_data";

}

} }

}

if (!in_array('weathermap_auth', $tables)) { // create the settings entries, if necessary

$sql[] = "CREATE TABLE weathermap_auth (

userid mediumint(9) NOT NULL default '0',

mapid int(11) NOT NULL default '0'

) TYPE=MyISAM;";

}

// create the settings entries, if necessary $pagestyle = read_config_option("weathermap_pagestyle");

if($pagestyle == '' or $pagestyle < 0 or $pagestyle >2)

{

$sql[] = "replace into settings values('weathermap_pagestyle',0)";

}

$pagestyle = read_config_option("weathermap_pagestyle"); $cycledelay = read_config_option("weathermap_cycle_refresh");

if($pagestyle == '' or $pagestyle < 0 or $pagestyle >1) if($cycledelay == '' or intval($cycledelay < 0) )

{ {

$sql[] = "replace into settings values('weathermap_pagestyle',0)"; $sql[] = "replace into settings values('weathermap_cycle_refresh',0)";

} }

$cycledelay = read_config_option("weathermap_cycle_refresh"); $renderperiod = read_config_option("weathermap_render_period");

if($cycledelay == '' or intval($cycledelay < 0) ) if($renderperiod == '' or intval($renderperiod < -1) )

{ {

$sql[] = "replace into settings values('weathermap_cycle_refresh',0)"; $sql[] = "replace into settings values('weathermap_render_period',0)";

} }

$quietlogging = read_config_option("weathermap_quiet_logging");

if($quietlogging == '' or intval($quietlogging < -1) )

{

$sql[] = "replace into settings values('weathermap_quiet_logging',0)";

}

$renderperiod = read_config_option("weathermap_render_period"); $rendercounter = read_config_option("weathermap_render_counter");

if($renderperiod == '' or intval($renderperiod < -1) ) if($rendercounter == '' or intval($rendercounter < 0) )

{ {

$sql[] = "replace into settings values('weathermap_render_period',0)"; $sql[] = "replace into settings values('weathermap_render_counter',0)";

}

$outputformat = read_config_option("weathermap_output_format");

if($outputformat == '' )

{

$sql[] = "replace into settings values('weathermap_output_format','png')";

}

$tsize = read_config_option("weathermap_thumbsize");

if($tsize == '' or $tsize < 1)

{

$sql[] = "replace into settings values('weathermap_thumbsize',250)";

}

$ms = read_config_option("weathermap_map_selector");

if($ms == '' or intval($ms) < 0 or intval($ms) > 1)

{

$sql[] = "replace into settings values('weathermap_map_selector',1)";

}

$at = read_config_option("weathermap_all_tab");

if($at == '' or intval($at) < 0 or intval($at) > 1)

{

$sql[] = "replace into settings values('weathermap_all_tab',0)";

}

// update the version, so we can skip this next time

$sql[] = "replace into settings values('weathermap_db_version','$myversion')";

// patch up the sortorder for any maps that don't have one.

$sql[] = "update weathermap_maps set sortorder=id where sortorder is null or sortorder=0;";

if (!empty($sql)) {

for ($a = 0; $a < count($sql); $a++) {

# cacti_log("Executing SQL: ".$sql[$a]."\n",true,"WEATHERMAP");

$result = db_execute($sql[$a]);

}

}

} }

else

$quietlogging = read_config_option("weathermap_quiet_logging");

if($quietlogging == '' or intval($quietlogging < -1) )

{ {

$sql[] = "replace into settings values('weathermap_quiet_logging',0)"; # cacti_log("Skipping SQL updates\n",true,"WEATHERMAP");

} }

}

$rendercounter = read_config_option("weathermap_render_counter"); function weathermap_config_arrays () {

if($rendercounter == '' or intval($rendercounter < 0) ) global $user_auth_realms, $user_auth_realm_filenames, $menu;

{ global $tree_item_types, $tree_item_handlers;

$sql[] = "replace into settings values('weathermap_render_counter',0)";

}

$outputformat = read_config_option("weathermap_output_format"); if (function_exists('api_plugin_register_realm')) {

if($outputformat == '' ) api_plugin_register_realm('weathermap', 'weathermap-cacti-plugin.php', 'Plugin -> Weathermap: View', 1);

{ api_plugin_register_realm('weathermap', 'weathermap-cacti-plugin-mgmt.php', 'Plugin -> Weathermap: Configure/Manage', 1);

$sql[] = "replace into settings values('weathermap_output_format','png')"; } else {

$user_auth_realms[42]='Plugin -> Weathermap: Configure/Manage';

$user_auth_realms[43]='Plugin -> Weathermap: View';

$user_auth_realm_filenames['weathermap-cacti-plugin.php'] = 43;

$user_auth_realm_filenames['weathermap-cacti-plugin-mgmt.php'] = 42;

# $user_auth_realm_filenames['weathermap-cacti-plugin-mgmt-groups.php'] = 42;

} }

// if there is support for custom graph tree types, then register ourselves

$tsize = read_config_option("weathermap_thumbsize"); if(isset($tree_item_handlers))

if($tsize == '' or $tsize < 1)

{ {

$sql[] = "replace into settings values('weathermap_thumbsize',250)"; $tree_item_types[10] = "Weathermap";

$tree_item_handlers[10] = array("render" => "weathermap_tree_item_render",

"name" => "weathermap_tree_item_name",

"edit" => "weathermap_tree_item_edit");

} }

// patch up the sortorder for any maps that don't have one. $wm_menu = array(

$sql[] = "update weathermap_maps set sortorder=id where sortorder is null or sortorder=0;"; 'plugins/weathermap/weathermap-cacti-plugin-mgmt.php' => "Weathermaps",

'plugins/weathermap/weathermap-cacti-plugin-mgmt-groups.php' => "Groups"

);

$menu["Management"]['plugins/weathermap/weathermap-cacti-plugin-mgmt.php'] = $wm_menu;

}

if (!empty($sql)) { function weathermap_tree_item_render($leaf)

for ($a = 0; $a < count($sql); $a++) { {

$result = db_execute($sql[$a]); global $colors;

$outdir = dirname(__FILE__).'/output/';

$confdir = dirname(__FILE__).'/configs/';

$map = db_fetch_assoc("select weathermap_maps.* from weathermap_auth,weathermap_maps where weathermap_maps.id=weathermap_auth.mapid and active='on' and (userid=".$_SESSION["sess_user_id"]." or userid=0) and weathermap_maps.id=".$leaf['item_id']);

if(sizeof($map))

{

$htmlfile = $outdir."weathermap_".$map[0]['id'].".html";

$maptitle = $map[0]['titlecache'];

if($maptitle == '') $maptitle= "Map for config file: ".$map[0]['configfile'];

html_graph_start_box(1,true);

?>

<tr bgcolor="<?php print $colors["panel"];?>">

<td>

<table width="100%" cellpadding="0" cellspacing="0">

<tr>

<td class="textHeader" nowrap><?php print $maptitle; ?></td>

</tr>

</table>

</td>

</tr>

<?php

print "<tr><td>";

if(file_exists($htmlfile))

{

include($htmlfile);

} }

print "</td></tr>";

html_graph_end_box();

} }

} }

function weathermap_config_arrays () { // calculate the name that cacti will use for this item in the tree views

global $user_auth_realms, $user_auth_realm_filenames, $menu; function weathermap_tree_item_name($item_id)

{

$description = db_fetch_cell("select titlecache from weathermap_maps where id=".intval($item_id));

if($description == '')

{

$configfile = db_fetch_cell("select configfile from weathermap_maps where id=".intval($item_id));

$description = "Map for config file: ".$configfile;

}

$user_auth_realms[42]='Configure Weathermap'; return $description;

$user_auth_realms[43]='View Weathermaps'; }

$user_auth_realm_filenames['weathermap-cacti-plugin.php'] = 43;

$user_auth_realm_filenames['weathermap-cacti-plugin-mgmt.php'] = 42;

$menu["Management"]['plugins/weathermap/weathermap-cacti-plugin-mgmt.php'] = "Weathermaps"; // the edit form, for when you add or edit a map in a graph tree

function weathermap_tree_item_edit($tree_item)

{

global $colors;

form_alternate_row_color($colors["form_alternate1"],$colors["form_alternate2"],0);

print "<td width='50%'><font class='textEditTitle'>Map</font><br />Choose which weathermap to add to the tree.</td><td>";

form_dropdown("item_id", db_fetch_assoc("select id,CONCAT_WS('',titlecache,' (',configfile,')') as name from weathermap_maps where active='on' order by titlecache, configfile"), "name", "id", $tree_item['item_id'], "", "0");

print "</td></tr>";

form_alternate_row_color($colors["form_alternate1"],$colors["form_alternate2"],1);

print "<td width='50%'><font class='textEditTitle'>Style</font><br />How should the map be displayed?</td><td>";

print "<select name='item_options'><option value=1>Thumbnail</option><option value=2>Full Size</option></select>";

print "</td></tr>";

} }

function weathermap_show_tab () { function weathermap_show_tab () {

global $config, $user_auth_realms, $user_auth_realm_filenames; global $config, $user_auth_realms, $user_auth_realm_filenames;

$realm_id2 = 0; $realm_id2 = 0;

if (isset($user_auth_realm_filenames[basename('weathermap-cacti-plugin.php')])) { if (isset($user_auth_realm_filenames[basename('weathermap-cacti-plugin.php')])) {

$realm_id2 = $user_auth_realm_filenames[basename('weathermap-cacti-plugin.php')]; $realm_id2 = $user_auth_realm_filenames[basename('weathermap-cacti-plugin.php')];

} }

if ((db_fetch_assoc("select user_auth_realm.realm_id from user_auth_realm where user_auth_realm.user_id='" . $_SESSION["sess_user_id"] . "' and user_auth_realm.realm_id='$realm_id2'")) || (empty($realm_id2))) { $tabstyle = intval(read_config_option("superlinks_tabstyle"));

$userid = (isset($_SESSION["sess_user_id"]) ? intval($_SESSION["sess_user_id"]) : 1);

if ((db_fetch_assoc("select user_auth_realm.realm_id from user_auth_realm where user_auth_realm.user_id='" . $userid . "' and user_auth_realm.realm_id='$realm_id2'")) || (empty($realm_id2))) {

print '<a href="' . $config['url_path'] . 'plugins/weathermap/weathermap-cacti-plugin.php"><img src="' . $config['url_path'] . 'plugins/weathermap/images/tab_wmap.gif" alt="Weathermap" align="absmiddle" border="0"></a>'; if($tabstyle>0)

{

$prefix="s_";

}

else

{

$prefix="";

}

print '<a href="' . $config['url_path'] . 'plugins/weathermap/weathermap-cacti-plugin.php"><img src="' . $config['url_path'] . 'plugins/weathermap/images/'.$prefix.'tab_weathermap';

// if we're ON a weathermap page, print '_red'

if(preg_match('/plugins\/weathermap\/weathermap-cacti-plugin.php/',$_SERVER['REQUEST_URI'] ,$matches))

{

print "_red";

}

print '.gif" alt="weathermap" align="absmiddle" border="0"></a>';

} }

weathermap_setup_table(); weathermap_setup_table();

} }

function weathermap_draw_navigation_text ($nav) { function weathermap_draw_navigation_text ($nav) {

$nav["weathermap-cacti-plugin.php:"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1"); $nav["weathermap-cacti-plugin.php:"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");

$nav["weathermap-cacti-plugin.php:viewmap"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1"); $nav["weathermap-cacti-plugin.php:viewmap"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");

$nav["weathermap-cacti-plugin.php:liveview"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");

$nav["weathermap-cacti-plugin.php:liveviewimage"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");

$nav["weathermap-cacti-plugin.php:viewmapcycle"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1"); $nav["weathermap-cacti-plugin.php:viewmapcycle"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");

$nav["weathermap-cacti-plugin.php:mrss"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");

$nav["weathermap-cacti-plugin.php:viewimage"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");

$nav["weathermap-cacti-plugin.php:viewthumb"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); $nav["weathermap-cacti-plugin-mgmt.php:"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

// $nav["weathermap-cacti-plugin-mgmt.php:addmap_picker"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); // $nav["weathermap-cacti-plugin-mgmt.php:addmap_picker"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:viewconfig"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); $nav["weathermap-cacti-plugin-mgmt.php:viewconfig"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:addmap"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); $nav["weathermap-cacti-plugin-mgmt.php:addmap"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

Line 271... Line 613...

// "graphs.php:graph_edit" => array("title" => "(Edit)", "mapping" => "index.php:,graphs.php:", "url" => "", "level" => "2"), // "graphs.php:graph_edit" => array("title" => "(Edit)", "mapping" => "index.php:,graphs.php:", "url" => "", "level" => "2"),

$nav["weathermap-cacti-plugin-mgmt.php:perms_edit"] = array("title" => "Edit Permissions", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2"); $nav["weathermap-cacti-plugin-mgmt.php:perms_edit"] = array("title" => "Edit Permissions", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");

$nav["weathermap-cacti-plugin-mgmt.php:addmap_picker"] = array("title" => "Add Map", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2"); $nav["weathermap-cacti-plugin-mgmt.php:addmap_picker"] = array("title" => "Add Map", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");

$nav["weathermap-cacti-plugin-mgmt.php:map_settings"] = array("title" => "Map Settings", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");

$nav["weathermap-cacti-plugin-mgmt.php:map_settings_form"] = array("title" => "Map Settings", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");

$nav["weathermap-cacti-plugin-mgmt.php:map_settings_delete"] = array("title" => "Map Settings", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");

$nav["weathermap-cacti-plugin-mgmt.php:map_settings_update"] = array("title" => "Map Settings", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");

$nav["weathermap-cacti-plugin-mgmt.php:map_settings_add"] = array("title" => "Map Settings", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");

// $nav["weathermap-cacti-plugin-mgmt.php:perms_edit"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); // $nav["weathermap-cacti-plugin-mgmt.php:perms_edit"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:perms_add_user"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); $nav["weathermap-cacti-plugin-mgmt.php:perms_add_user"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:perms_delete_user"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); $nav["weathermap-cacti-plugin-mgmt.php:perms_delete_user"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:delete_map"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); $nav["weathermap-cacti-plugin-mgmt.php:delete_map"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:move_map_down"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); $nav["weathermap-cacti-plugin-mgmt.php:move_map_down"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:move_map_up"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); $nav["weathermap-cacti-plugin-mgmt.php:move_map_up"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:move_group_down"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:move_group_up"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:group_form"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:group_update"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:activate_map"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); $nav["weathermap-cacti-plugin-mgmt.php:activate_map"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:deactivate_map"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); $nav["weathermap-cacti-plugin-mgmt.php:deactivate_map"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:rebuildnow"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1"); $nav["weathermap-cacti-plugin-mgmt.php:rebuildnow"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:rebuildnow2"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:chgroup"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:chgroup_update"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:groupadmin"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

$nav["weathermap-cacti-plugin-mgmt.php:groupadmin_delete"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");

return $nav; return $nav;

} }

function weathermap_poller_output($rrd_update_array) {

global $config;

// global $weathermap_debugging;

$logging = read_config_option("log_verbosity");

if($logging >= POLLER_VERBOSITY_DEBUG) cacti_log("WM poller_output: STARTING\n",true,"WEATHERMAP");

// partially borrowed from Jimmy Conner's THold plugin.

// (although I do things slightly differently - I go from filenames, and don't use the poller_interval)

// $requiredlist = db_fetch_assoc("select distinct weathermap_data.*, data_template_data.local_data_id, data_template_rrd.data_source_type_id from weathermap_data, data_template_data, data_template_rrd where weathermap_data.rrdfile=data_template_data.data_source_path and data_template_rrd.local_data_id=data_template_data.local_data_id");

// new version works with *either* a local_data_id or rrdfile in the weathermap_data table, and returns BOTH

$requiredlist = db_fetch_assoc("select distinct weathermap_data.id, weathermap_data.last_value, weathermap_data.last_time, weathermap_data.data_source_name, data_template_data.data_source_path, data_template_data.local_data_id, data_template_rrd.data_source_type_id from weathermap_data, data_template_data, data_template_rrd where weathermap_data.local_data_id=data_template_data.local_data_id and data_template_rrd.local_data_id=data_template_data.local_data_id and weathermap_data.local_data_id<>0;");

$path_rra = $config["rra_path"];

# especially on Windows, it seems that filenames are not reliable (sometimes \ and sometimes / even though path_rra is always /) .

# let's make an index from local_data_id to filename, and then use local_data_id as the key...

foreach (array_keys($rrd_update_array) as $key)

{

if(isset( $rrd_update_array[$key]['times']) && is_array($rrd_update_array[$key]['times']) )

{

# if($logging >= POLLER_VERBOSITY_DEBUG) cacti_log("WM poller_output: Adding $key",true,"WEATHERMAP");

$knownfiles[ $rrd_update_array[$key]["local_data_id"] ] = $key;

}

}

foreach ($requiredlist as $required)

{

$file = str_replace("<path_rra>", $path_rra, $required['data_source_path']);

$dsname = $required['data_source_name'];

$local_data_id = $required['local_data_id'];

if(isset($knownfiles[$local_data_id]))

{

$file2 = $knownfiles[$local_data_id];

if($file2 != '') $file = $file2;

}

if($logging >= POLLER_VERBOSITY_DEBUG) cacti_log("WM poller_output: Looking for $file ($local_data_id) (".$required['data_source_path'].")\n",true,"WEATHERMAP");

if( isset($rrd_update_array[$file]) && is_array($rrd_update_array[$file]) && isset($rrd_update_array[$file]['times']) && is_array($rrd_update_array[$file]['times']) && isset( $rrd_update_array{$file}['times'][key($rrd_update_array[$file]['times'])]{$dsname} ) )

{

$value = $rrd_update_array{$file}['times'][key($rrd_update_array[$file]['times'])]{$dsname};

$time = key($rrd_update_array[$file]['times']);

if (read_config_option("log_verbosity") >= POLLER_VERBOSITY_MEDIUM)

cacti_log("WM poller_output: Got one! $file:$dsname -> $time $value\n",true,"WEATHERMAP");

$period = $time - $required['last_time'];

$lastval = $required['last_value'];

// if the new value is a NaN, we'll give 0 instead, and pretend it didn't happen from the point

// of view of the counter etc. That way, we don't get those enormous spikes. Still doesn't deal with

// reboots very well, but it should improve it for drops.

if($value == 'U')

{

$newvalue = 0;

$newlastvalue = $lastval;

$newtime = $required['last_time'];

}

else

{

$newlastvalue = $value;

$newtime = $time;

switch($required['data_source_type_id'])

{

case 1: //GAUGE

$newvalue = $value;

break;

case 2: //COUNTER

if ($value >= $lastval) {

// Everything is normal

$newvalue = $value - $lastval;

} else {

// Possible overflow, see if its 32bit or 64bit

if ($lastval > 4294967295) {

$newvalue = (18446744073709551615 - $lastval) + $value;

} else {

$newvalue = (4294967295 - $lastval) + $value;

}

}

$newvalue = $newvalue / $period;

break;

case 3: //DERIVE

$newvalue = ($value-$lastval) / $period;

break;

case 4: //ABSOLUTE

$newvalue = $value / $period;

break;

default: // do something somewhat sensible in case something odd happens

$newvalue = $value;

warn("poller_output found an unknown data_source_type_id for $file:$dsname");

break;

}

}

db_execute("UPDATE weathermap_data SET last_time=$newtime, last_calc='$newvalue', last_value='$newlastvalue',sequence=sequence+1 where id = " . $required['id']);

if($logging >= POLLER_VERBOSITY_DEBUG) cacti_log("WM poller_output: Final value is $newvalue (was $lastval, period was $period)\n",true,"WEATHERMAP");

}

else

{

if(1==0 && $logging >= POLLER_VERBOSITY_DEBUG)

{

# cacti_log("WM poller_output: ENDING\n",true,"WEATHERMAP");

cacti_log("WM poller_output: Didn't find it.\n",true,"WEATHERMAP");

cacti_log("WM poller_output: DID find these:\n",true,"WEATHERMAP");

foreach (array_keys($rrd_update_array) as $key)

{

$local_data_id = $rrd_update_array[$key]["local_data_id"];

cacti_log("WM poller_output: $key ($local_data_id)\n",true,"WEATHERMAP");

}

}

}

}

if($logging >= POLLER_VERBOSITY_DEBUG) cacti_log("WM poller_output: ENDING\n",true,"WEATHERMAP");

return $rrd_update_array;

}

function weathermap_poller_bottom () { function weathermap_poller_bottom() {

global $config; global $config;

global $weathermap_debugging, $WEATHERMAP_VERSION; global $weathermap_debugging, $WEATHERMAP_VERSION;

include_once($config["library_path"] . DIRECTORY_SEPARATOR."database.php"); include_once($config["library_path"] . DIRECTORY_SEPARATOR."database.php");

include_once(dirname(__FILE__).DIRECTORY_SEPARATOR."lib".DIRECTORY_SEPARATOR."poller-common.php"); include_once(dirname(__FILE__).DIRECTORY_SEPARATOR."lib".DIRECTORY_SEPARATOR."poller-common.php");

Line 309... Line 794...

return; return;

} }

else else

{ {

// if we're due, run the render updates // if we're due, run the render updates

if( ($rendercounter % $renderperiod) == 0) if( ( $renderperiod == 0) || ( ($rendercounter % $renderperiod) == 0) )

{ {

weathermap_run_maps(dirname(__FILE__) ); weathermap_run_maps(dirname(__FILE__) );

} }

else else

{ {

-Rev 13
+Rev 85
 Line 7...
         Program ........ Network Weathermap for Cacti
         Version ........ See code below
         Purpose ........ Network Usage Overview
 *******************************************************************************/
+// who knows why this changed... not me.
+function disabled_plugin_weathermap_version()
+{
+        return(weathermap_version());
+}
 function weathermap_version () {
         return array(   'name'          => 'weathermap',
-                'version'       => '0.92',
+                'version'       => '0.97a',
                 'longname'      => 'PHP Network Weathermap',
                 'author'        => 'Howard Jones',
-                'homepage'      => 'http://wotsit.thingy.com/haj/cacti/php-weathermap/',
+                'homepage'      => 'http://www.network-weathermap.com/',
+                'webpage'      => 'http://www.network-weathermap.com/',
                 'email'         => 'howie@thingy.com',
-                'url'           => 'http://wotsit.thingy.com/haj/cacti/versions.php'
+                'url'           => 'http://www.network-weathermap.com/versions.php'
         );
 }
+function disabled_plugin_weathermap_uninstall() {
+        // doesn't really do anything. Here to remind me.
+        // not sure what it should really do.
+}
+function disabled_plugin_weathermap_check_config() {
+        // doesn't really do anything either because it's not implemented yet in PIA. Would be handy if it was.
+        if(!function_exists("imagecreate")) return FALSE;
+        if(!function_exists("preg_match")) return FALSE;
+        if(!function_exists("imagecreatetruecolor")) return FALSE;
+        if(!function_exists("imagecreatefrompng")) return FALSE;
+        if(!function_exists("imagepng")) return FALSE;
+        if(!function_exists("imageSaveAlpha")) return FALSE;
+        if(!function_exists("imagealphablending")) return FALSE;
+//      if(!function_exists("imagecopyresampled")) return FALSE;
+        return TRUE;
+}
+function disabled_plugin_weathermap_install () {
+        api_plugin_register_hook('weathermap', 'config_arrays',         'weathermap_config_arrays',        'setup.php');
+        api_plugin_register_hook('weathermap', 'draw_navigation_text',  'weathermap_draw_navigation_text', 'setup.php');
+        api_plugin_register_hook('weathermap', 'config_settings',       'weathermap_config_settings',      'setup.php');
+        api_plugin_register_hook('weathermap', 'top_header_tabs',       'weathermap_show_tab',             'setup.php');
+        api_plugin_register_hook('weathermap', 'top_graph_header_tabs', 'weathermap_show_tab',             'setup.php');
+        api_plugin_register_hook('weathermap', 'poller_bottom', 'weathermap_poller_bottom',             'setup.php');
+        api_plugin_register_hook('weathermap', 'poller_top', 'weathermap_poller_top',             'setup.php');
+        api_plugin_register_hook('weathermap', 'poller_output', 'weathermap_poller_output',             'setup.php');
+        api_plugin_register_hook('weathermap', 'top_graph_refresh', 'weathermap_top_graph_refresh',             'setup.php');
+        api_plugin_register_hook('weathermap', 'page_title', 'weathermap_page_title',             'setup.php');
+        api_plugin_register_hook('weathermap', 'page_head', 'weathermap_page_head',             'setup.php');
+        weathermap_setup_table ();
+}
 function plugin_init_weathermap() {
         global $plugin_hooks;
         $plugin_hooks['top_header_tabs']['weathermap'] = 'weathermap_show_tab';
         $plugin_hooks['top_graph_header_tabs']['weathermap'] = 'weathermap_show_tab';
         $plugin_hooks['config_arrays']['weathermap'] = 'weathermap_config_arrays';
         $plugin_hooks['draw_navigation_text']['weathermap'] = 'weathermap_draw_navigation_text';
         $plugin_hooks['config_settings']['weathermap'] = 'weathermap_config_settings';
         $plugin_hooks['poller_bottom']['weathermap'] = 'weathermap_poller_bottom';
+        $plugin_hooks['poller_top']['weathermap'] = 'weathermap_poller_top';
+        $plugin_hooks['poller_output']['weathermap'] = 'weathermap_poller_output';
         $plugin_hooks['top_graph_refresh']['weathermap'] = 'weathermap_top_graph_refresh';
+        $plugin_hooks['page_title']['weathermap'] = 'weathermap_page_title';
+        $plugin_hooks['page_head']['weathermap'] = 'weathermap_page_head';
 }
+// figure out if this poller run is hitting the 'cron' entry for any maps.
+function weathermap_poller_top()
+{
+        global $weathermap_poller_start_time;
+        $n = time();
+        // round to the nearest minute, since that's all we need for the crontab-style stuff
+        $weathermap_poller_start_time = $n - ($n%60);
+}
+function weathermap_page_head()
+{
+        global $config;
+        // Add in a Media RSS link on the thumbnail view
+        // - format isn't quite right, so it's disabled for now.
+        //      if(preg_match('/plugins\/weathermap\/weathermap\-cacti\-plugin\.php/',$_SERVER['REQUEST_URI'] ,$matches))
+        //      {
+        //              print '<link id="media-rss" title="My Network Weathermaps" rel="alternate" href="?action=mrss" type="application/rss+xml">';
+        //      }
+        if(preg_match('/plugins\/weathermap\//',$_SERVER['REQUEST_URI'] ,$matches))
+    {
+                print '<LINK rel="stylesheet" type="text/css" media="screen" href="weathermap-cacti-plugin.css">';
+        }
+}
+function weathermap_page_title( $t )
+{
+        if(preg_match('/plugins\/weathermap\//',$_SERVER['REQUEST_URI'] ,$matches))
+        {
+                $t .= " - Weathermap";
+                if(preg_match('/plugins\/weathermap\/weathermap-cacti-plugin.php\?action=viewmap&id=([^&]+)/',$_SERVER['REQUEST_URI'],$matches))
+                {
+                        $mapid = $matches[1];
+                                                if(preg_match("/^\d+$/",$mapid))
+                                                {
+                                                        $title = db_fetch_cell("SELECT titlecache from weathermap_maps where ID=".intval($mapid));
+                                                }
+                                                else
+                                                {
+                                                        $title = db_fetch_cell("SELECT titlecache from weathermap_maps where filehash='".mysql_real_escape_string($mapid)."'");
+                                                }
+                        if(isset($title)) $t .= " - $title";
+                }
+        }
+        return($t);
+}
 function weathermap_top_graph_refresh($refresh)
 {
         if (basename($_SERVER["PHP_SELF"]) != "weathermap-cacti-plugin.php")
                 return $refresh;
         // if we're cycling maps, then we want to handle reloads ourselves, thanks
-        if($_REQUEST["action"] == 'viewmapcycle')
+        if(isset($_REQUEST["action"]) && $_REQUEST["action"] == 'viewmapcycle')
         {
                 return(86400);
         }
         return ($refresh);
 }
-Line 58...
+Line 165...
                 ),
                 "weathermap_pagestyle" => array(
                         "friendly_name" => "Page style",
                         "description" => "How to display multiple maps.",
                         "method" => "drop_array",
-                        "array" => array(0 => "Thumbnail Overview", 1 => "Full Images")
+                        "array" => array(0 => "Thumbnail Overview", 1 => "Full Images", 2 => "Show Only First")
                 ),
                 "weathermap_thumbsize" => array(
                         "friendly_name" => "Thumbnail Maximum Size",
                         "description" => "The maximum width or height for thumbnails in thumbnail view, in pixels. Takes effect after the next poller run.",
                         "method" => "textbox",
-Line 107...
+Line 214...
 => 'Every 72 Poller Cycles',
 => 'Every 288 Poller Cycles',
                 ),
         ),
+        "weathermap_all_tab" => array(
+                "friendly_name" => "Show 'All' Tab",
+                "description" => "When using groups, add an 'All Maps' tab to the tab bar.",
+                "method" => "drop_array",
+                "array" => array(0=>"No (default)",1=>"Yes")
+                ),
+        "weathermap_map_selector" => array(
+                "friendly_name" => "Show Map Selector",
+                "description" => "Show a combo-box map selector on the full-screen map view.",
+                "method" => "drop_array",
+                "array" => array(0=>"No",1=>"Yes (default)")
+                ),
         "weathermap_quiet_logging" => array(
                 "friendly_name" => "Quiet Logging",
                 "description" => "By default, even in LOW level logging, Weathermap logs normal activity. This makes it REALLY log only errors in LOW mode.",
                 "method" => "drop_array",
                 "array" => array(0=>"Chatty (default)",1=>"Quiet")
-Line 123...
+Line 242...
 }
 function weathermap_setup_table () {
         global $config, $database_default;
+        global $WEATHERMAP_VERSION;
         include_once($config["library_path"] . DIRECTORY_SEPARATOR . "database.php");
-        $sql = "show tables from " . $database_default;
+        $dbversion = read_config_option("weathermap_db_version");
-        $result = db_fetch_assoc($sql) or die (mysql_error());
-        $tables = array();
+        $myversioninfo = weathermap_version();
-        $sql = array();
+        $myversion = $myversioninfo['version'];
+        // only bother with all this if it's a new install, a new version, or we're in a development version
+        // - saves a handful of db hits per request!
+        if( ($dbversion=="") || (preg_match("/dev$/",$myversion)) || ($dbversion != $myversion) )
+        {
+                # cacti_log("Doing setup_table() \n",true,"WEATHERMAP");
+                $sql = "show tables";
+                $result = db_fetch_assoc($sql) or die (mysql_error());
-        foreach($result as $index => $arr) {
+                $tables = array();
-                foreach ($arr as $t) {
+                $sql = array();
-                        $tables[] = $t;
+                foreach($result as $index => $arr) {
+                        foreach ($arr as $t) {
+                                $tables[] = $t;
+                        }
                 }
-        }
-        $sql[] = "update weathermap_maps set sortorder=id where sortorder is null;";
+                $sql[] = "update weathermap_maps set sortorder=id where sortorder is null;";
+                if (!in_array('weathermap_maps', $tables)) {
+                        $sql[] = "CREATE TABLE weathermap_maps (
+                                id int(11) NOT NULL auto_increment,
+                                sortorder int(11) NOT NULL default 0,
+                                group_id int(11) NOT NULL default 1,
+                                active set('on','off') NOT NULL default 'on',
+                                configfile text NOT NULL,
+                                imagefile text NOT NULL,
+                                htmlfile text NOT NULL,
+                                titlecache text NOT NULL,
+                                filehash varchar (40) NOT NULL default '',
+                                warncount int(11) NOT NULL default 0,
+                                config text NOT NULL default '',
+                                thumb_width int(11) NOT NULL default 0,
+                                thumb_height int(11) NOT NULL default 0,
+                                schedule varchar(32) NOT NULL default '*',
+                                archiving set('on','off') NOT NULL default 'off',
+                                PRIMARY KEY  (id)
+                        ) TYPE=MyISAM;";
+                }
+                else
+                {
+                        $colsql = "show columns from weathermap_maps from " . $database_default;
+                        $result = mysql_query($colsql) or die (mysql_error());
+                        $found_so = false;      $found_fh = false;
+                        $found_wc = false;      $found_cf = false;
+                        $found_96changes = false;
+                        $found_96bchanges = false;
+                        while ($row = mysql_fetch_array($result, MYSQL_ASSOC)) {
+                                if ($row['Field'] == 'sortorder') $found_so = true;
+                                if ($row['Field'] == 'filehash') $found_fh = true;
+                                if ($row['Field'] == 'warncount') $found_wc = true;
+                                if ($row['Field'] == 'config') $found_cf = true;
+                                if ($row['Field'] == 'thumb_width') $found_96changes = true;
+                                if ($row['Field'] == 'group_id') $found_96bchanges = true;
+                        }
+                        if (!$found_so) $sql[] = "alter table weathermap_maps add sortorder int(11) NOT NULL default 0 after id";
+                        if (!$found_fh) $sql[] = "alter table weathermap_maps add filehash varchar(40) NOT NULL default '' after titlecache";
+                        if (!$found_wc) $sql[] = "alter table weathermap_maps add warncount int(11) NOT NULL default 0 after filehash";
+                        if (!$found_cf) $sql[] = "alter table weathermap_maps add config text NOT NULL  default '' after warncount";
+                        if (!$found_96changes)
+                        {
+                                $sql[] = "alter table weathermap_maps add thumb_width int(11) NOT NULL default 0 after config";
+                                $sql[] = "alter table weathermap_maps add thumb_height int(11) NOT NULL default 0 after thumb_width";
+                                $sql[] = "alter table weathermap_maps add schedule varchar(32) NOT NULL default '*' after thumb_height";
+                                $sql[] = "alter table weathermap_maps add archiving set('on','off') NOT NULL default 'off' after schedule";
+                        }
+                        if (!$found_96bchanges)
+                        {
+                                $sql[] = "alter table weathermap_maps add group_id int(11) NOT NULL default 1 after sortorder";
+                                $sql[] = "ALTER TABLE `weathermap_settings` ADD `groupid` INT NOT NULL DEFAULT '0' AFTER `mapid`";
+                        }
+                }
-        if (!in_array('weathermap_maps', $tables)) {
+                $sql[] = "update weathermap_maps set filehash=LEFT(MD5(concat(id,configfile,rand())),20) where filehash = '';";
-                $sql[] = "CREATE TABLE weathermap_maps (
-                        id int(11) NOT NULL auto_increment,
+                if (!in_array('weathermap_auth', $tables)) {
-                        sortorder int(11) NOT NULL default 0,
+                        $sql[] = "CREATE TABLE weathermap_auth (
-                        active set('on','off') NOT NULL default 'on',
+                                userid mediumint(9) NOT NULL default '0',
-                        configfile text NOT NULL,
+                                mapid int(11) NOT NULL default '0'
-                        imagefile text NOT NULL,
+                        ) TYPE=MyISAM;";
-                        htmlfile text NOT NULL,
-                        titlecache text NOT NULL,
-                        PRIMARY KEY  (id)
-                ) TYPE=MyISAM;";
-        }
-        else
-        {
-                $colsql = "show columns from weathermap_maps from " . $database_default;
-                $result = mysql_query($colsql) or die (mysql_error());
-                $found = false;
-                while ($row = mysql_fetch_array($result, MYSQL_ASSOC)) {
-                        if ($row['Field'] == 'sortorder')
-                                $found = true;
                 }
-                if (!$found)
+                if (!in_array('weathermap_groups', $tables)) {
+                        $sql[] = "CREATE TABLE  weathermap_groups (
+                                `id` INT(11) NOT NULL auto_increment,
+                                `name` VARCHAR( 128 ) NOT NULL default '',
+                                `sortorder` INT(11) NOT NULL default 0,
+                                PRIMARY KEY (id)
+                                ) TYPE=MyISAM;";
+                        $sql[] = "INSERT INTO weathermap_groups (id,name,sortorder) VALUES (1,'Weathermaps',1)";
+                }
+                if (!in_array('weathermap_settings', $tables)) {
+                        $sql[] = "CREATE TABLE weathermap_settings (
+                                id int(11) NOT NULL auto_increment,
+                                mapid int(11) NOT NULL default '0',
+                                groupid int(11) NOT NULL default '0',
+                                optname varchar(128) NOT NULL default '',
+                                optvalue varchar(128) NOT NULL default '',
+                                PRIMARY KEY  (id)
+                        ) TYPE=MyISAM;";
+                }
+                if (!in_array('weathermap_data', $tables)) {
+                        $sql[] = "CREATE TABLE IF NOT EXISTS weathermap_data (id int(11) NOT NULL auto_increment,
+                                rrdfile varchar(255) NOT NULL,data_source_name varchar(19) NOT NULL,
+                                  last_time int(11) NOT NULL,last_value varchar(255) NOT NULL,
+                                last_calc varchar(255) NOT NULL, sequence int(11) NOT NULL, local_data_id int(11) NOT NULL DEFAULT 0, PRIMARY KEY  (id), KEY rrdfile (rrdfile),
+                                  KEY local_data_id (local_data_id), KEY data_source_name (data_source_name) ) TYPE=MyISAM";
+                }
+                else
                 {
-                        $sql[] = "alter table weathermap_maps add sortorder int(11) NOT NULL default 0 after id";
+                        $colsql = "show columns from weathermap_data from " . $database_default;
+                        $result = mysql_query($colsql) or die (mysql_error());
+                        $found_ldi = false;
+                        while ($row = mysql_fetch_array($result, MYSQL_ASSOC)) {
+                                if ($row['Field'] == 'local_data_id') $found_ldi = true;
+                        }
+                        if (!$found_ldi)
+                        {
+                                $sql[] = "alter table weathermap_data add local_data_id int(11) NOT NULL default 0 after sequence";
+                                $sql[] = "alter table weathermap_data add index ( `local_data_id` )";
+                                # if there is existing data without a local_data_id, ditch it
+                                $sql[] = "delete from weathermap_data";
+                        }
                 }
-        }
-        if (!in_array('weathermap_auth', $tables)) {
+                // create the settings entries, if necessary
-                $sql[] = "CREATE TABLE weathermap_auth (
-                        userid mediumint(9) NOT NULL default '0',
-                        mapid int(11) NOT NULL default '0'
-                ) TYPE=MyISAM;";
-        }
-        // create the settings entries, if necessary
+                $pagestyle = read_config_option("weathermap_pagestyle");
+                if($pagestyle == '' or $pagestyle < 0 or $pagestyle >2)
+                {
+                        $sql[] = "replace into settings values('weathermap_pagestyle',0)";
+                }
-        $pagestyle = read_config_option("weathermap_pagestyle");
+                $cycledelay = read_config_option("weathermap_cycle_refresh");
-        if($pagestyle == '' or $pagestyle < 0 or $pagestyle >1)
+                if($cycledelay == '' or intval($cycledelay < 0) )
-        {
+                {
-                $sql[] = "replace into settings values('weathermap_pagestyle',0)";
+                        $sql[] = "replace into settings values('weathermap_cycle_refresh',0)";
-        }
+                }
-        $cycledelay = read_config_option("weathermap_cycle_refresh");
+                $renderperiod = read_config_option("weathermap_render_period");
-        if($cycledelay == '' or intval($cycledelay < 0) )
+                if($renderperiod == '' or intval($renderperiod < -1) )
-        {
+                {
-                $sql[] = "replace into settings values('weathermap_cycle_refresh',0)";
+                        $sql[] = "replace into settings values('weathermap_render_period',0)";
-        }
+                }
+                $quietlogging = read_config_option("weathermap_quiet_logging");
+                if($quietlogging == '' or intval($quietlogging < -1) )
+                {
+                        $sql[] = "replace into settings values('weathermap_quiet_logging',0)";
+                }
-        $renderperiod = read_config_option("weathermap_render_period");
+                $rendercounter = read_config_option("weathermap_render_counter");
-        if($renderperiod == '' or intval($renderperiod < -1) )
+                if($rendercounter == '' or intval($rendercounter < 0) )
-        {
+                {
-                $sql[] = "replace into settings values('weathermap_render_period',0)";
+                        $sql[] = "replace into settings values('weathermap_render_counter',0)";
+                }
+                $outputformat = read_config_option("weathermap_output_format");
+                if($outputformat == '' )
+                {
+                        $sql[] = "replace into settings values('weathermap_output_format','png')";
+                }
+                $tsize = read_config_option("weathermap_thumbsize");
+                if($tsize == '' or $tsize < 1)
+                {
+                        $sql[] = "replace into settings values('weathermap_thumbsize',250)";
+                }
+                $ms = read_config_option("weathermap_map_selector");
+                if($ms == '' or intval($ms) < 0 or intval($ms) > 1)
+                {
+                        $sql[] = "replace into settings values('weathermap_map_selector',1)";
+                }
+                $at = read_config_option("weathermap_all_tab");
+                if($at == '' or intval($at) < 0 or intval($at) > 1)
+                {
+                        $sql[] = "replace into settings values('weathermap_all_tab',0)";
+                }
+                // update the version, so we can skip this next time
+                $sql[] = "replace into settings values('weathermap_db_version','$myversion')";
+                // patch up the sortorder for any maps that don't have one.
+                $sql[] = "update weathermap_maps set sortorder=id where sortorder is null or sortorder=0;";
+                if (!empty($sql)) {
+                        for ($a = 0; $a < count($sql); $a++) {
+                                # cacti_log("Executing SQL: ".$sql[$a]."\n",true,"WEATHERMAP");
+                                $result = db_execute($sql[$a]);
+                        }
+                }
         }
+        else
-        $quietlogging = read_config_option("weathermap_quiet_logging");
-        if($quietlogging == '' or intval($quietlogging < -1) )
         {
-                $sql[] = "replace into settings values('weathermap_quiet_logging',0)";
+                # cacti_log("Skipping SQL updates\n",true,"WEATHERMAP");
         }
+}
-        $rendercounter = read_config_option("weathermap_render_counter");
+function weathermap_config_arrays () {
-        if($rendercounter == '' or intval($rendercounter < 0) )
+        global $user_auth_realms, $user_auth_realm_filenames, $menu;
-        {
+        global $tree_item_types, $tree_item_handlers;
-                $sql[] = "replace into settings values('weathermap_render_counter',0)";
-        }
-        $outputformat = read_config_option("weathermap_output_format");
+        if (function_exists('api_plugin_register_realm')) {
-        if($outputformat == '' )
+                api_plugin_register_realm('weathermap', 'weathermap-cacti-plugin.php', 'Plugin -> Weathermap: View', 1);
-        {
+                api_plugin_register_realm('weathermap', 'weathermap-cacti-plugin-mgmt.php', 'Plugin -> Weathermap: Configure/Manage', 1);
-                $sql[] = "replace into settings values('weathermap_output_format','png')";
+        } else {
+                $user_auth_realms[42]='Plugin -> Weathermap: Configure/Manage';
+                $user_auth_realms[43]='Plugin -> Weathermap: View';
+                $user_auth_realm_filenames['weathermap-cacti-plugin.php'] = 43;
+                $user_auth_realm_filenames['weathermap-cacti-plugin-mgmt.php'] = 42;
+#               $user_auth_realm_filenames['weathermap-cacti-plugin-mgmt-groups.php'] = 42;
         }
+        // if there is support for custom graph tree types, then register ourselves
-        $tsize = read_config_option("weathermap_thumbsize");
+        if(isset($tree_item_handlers))
-        if($tsize == '' or $tsize < 1)
         {
-                $sql[] = "replace into settings values('weathermap_thumbsize',250)";
+                $tree_item_types[10] = "Weathermap";
+                $tree_item_handlers[10] = array("render" => "weathermap_tree_item_render",
+                                        "name" => "weathermap_tree_item_name",
+                                        "edit" => "weathermap_tree_item_edit");
         }
-        // patch up the sortorder for any maps that don't have one.
+        $wm_menu = array(
-        $sql[] = "update weathermap_maps set sortorder=id where sortorder is null or sortorder=0;";
+                'plugins/weathermap/weathermap-cacti-plugin-mgmt.php' => "Weathermaps",
+                'plugins/weathermap/weathermap-cacti-plugin-mgmt-groups.php' => "Groups"
+        );
+        $menu["Management"]['plugins/weathermap/weathermap-cacti-plugin-mgmt.php'] = $wm_menu;
+}
-        if (!empty($sql)) {
+function weathermap_tree_item_render($leaf)
-                for ($a = 0; $a < count($sql); $a++) {
+{
-                        $result = db_execute($sql[$a]);
+        global $colors;
+        $outdir = dirname(__FILE__).'/output/';
+        $confdir = dirname(__FILE__).'/configs/';
+        $map = db_fetch_assoc("select weathermap_maps.* from weathermap_auth,weathermap_maps where weathermap_maps.id=weathermap_auth.mapid and active='on' and (userid=".$_SESSION["sess_user_id"]." or userid=0) and weathermap_maps.id=".$leaf['item_id']);
+        if(sizeof($map))
+        {
+                $htmlfile = $outdir."weathermap_".$map[0]['id'].".html";
+                $maptitle = $map[0]['titlecache'];
+                if($maptitle == '') $maptitle= "Map for config file: ".$map[0]['configfile'];
+                html_graph_start_box(1,true);
+?>
+<tr bgcolor="<?php print $colors["panel"];?>">
+  <td>
+          <table width="100%" cellpadding="0" cellspacing="0">
+                <tr>
+                   <td class="textHeader" nowrap><?php print $maptitle; ?></td>
+                </tr>
+          </table>
+  </td>
+</tr>
+<?php
+                print "<tr><td>";
+                if(file_exists($htmlfile))
+                {
+                        include($htmlfile);
                 }
+                print "</td></tr>";
+                html_graph_end_box();
         }
 }
-function weathermap_config_arrays () {
+// calculate the name that cacti will use for this item in the tree views
-        global $user_auth_realms, $user_auth_realm_filenames, $menu;
+function weathermap_tree_item_name($item_id)
+{
+        $description = db_fetch_cell("select titlecache from weathermap_maps where id=".intval($item_id));
+        if($description == '')
+        {
+                $configfile = db_fetch_cell("select configfile from weathermap_maps where id=".intval($item_id));
+                $description = "Map for config file: ".$configfile;
+        }
-        $user_auth_realms[42]='Configure Weathermap';
+        return $description;
-        $user_auth_realms[43]='View Weathermaps';
+}
-        $user_auth_realm_filenames['weathermap-cacti-plugin.php'] = 43;
-        $user_auth_realm_filenames['weathermap-cacti-plugin-mgmt.php'] = 42;
-        $menu["Management"]['plugins/weathermap/weathermap-cacti-plugin-mgmt.php'] = "Weathermaps";
+// the edit form, for when you add or edit a map in a graph tree
+function weathermap_tree_item_edit($tree_item)
+{
+        global $colors;
+        form_alternate_row_color($colors["form_alternate1"],$colors["form_alternate2"],0);
+        print "<td width='50%'><font class='textEditTitle'>Map</font><br />Choose which weathermap to add to the tree.</td><td>";
+        form_dropdown("item_id", db_fetch_assoc("select id,CONCAT_WS('',titlecache,' (',configfile,')') as name from weathermap_maps where active='on' order by titlecache, configfile"), "name", "id", $tree_item['item_id'], "", "0");
+        print "</td></tr>";
+        form_alternate_row_color($colors["form_alternate1"],$colors["form_alternate2"],1);
+        print "<td width='50%'><font class='textEditTitle'>Style</font><br />How should the map be displayed?</td><td>";
+        print "<select name='item_options'><option value=1>Thumbnail</option><option value=2>Full Size</option></select>";
+        print "</td></tr>";
 }
 function weathermap_show_tab () {
         global $config, $user_auth_realms, $user_auth_realm_filenames;
         $realm_id2 = 0;
         if (isset($user_auth_realm_filenames[basename('weathermap-cacti-plugin.php')])) {
                 $realm_id2 = $user_auth_realm_filenames[basename('weathermap-cacti-plugin.php')];
         }
-        if ((db_fetch_assoc("select user_auth_realm.realm_id from user_auth_realm where user_auth_realm.user_id='" . $_SESSION["sess_user_id"] . "' and user_auth_realm.realm_id='$realm_id2'")) || (empty($realm_id2))) {
+        $tabstyle = intval(read_config_option("superlinks_tabstyle"));
+        $userid = (isset($_SESSION["sess_user_id"]) ? intval($_SESSION["sess_user_id"]) : 1);
+        if ((db_fetch_assoc("select user_auth_realm.realm_id from user_auth_realm where user_auth_realm.user_id='" . $userid . "' and user_auth_realm.realm_id='$realm_id2'")) || (empty($realm_id2))) {
-                print '<a href="' . $config['url_path'] . 'plugins/weathermap/weathermap-cacti-plugin.php"><img src="' . $config['url_path'] . 'plugins/weathermap/images/tab_wmap.gif" alt="Weathermap" align="absmiddle" border="0"></a>';
+                if($tabstyle>0)
+                {
+                        $prefix="s_";
+                }
+                else
+                {
+                        $prefix="";
+                }
+                print '<a href="' . $config['url_path'] . 'plugins/weathermap/weathermap-cacti-plugin.php"><img src="' . $config['url_path'] . 'plugins/weathermap/images/'.$prefix.'tab_weathermap';
+                // if we're ON a weathermap page, print '_red'
+                if(preg_match('/plugins\/weathermap\/weathermap-cacti-plugin.php/',$_SERVER['REQUEST_URI'] ,$matches))
+                {
+                        print "_red";
+                }
+                print '.gif" alt="weathermap" align="absmiddle" border="0"></a>';
         }
         weathermap_setup_table();
 }
 function weathermap_draw_navigation_text ($nav) {
         $nav["weathermap-cacti-plugin.php:"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");
         $nav["weathermap-cacti-plugin.php:viewmap"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");
+        $nav["weathermap-cacti-plugin.php:liveview"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");
+        $nav["weathermap-cacti-plugin.php:liveviewimage"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");
         $nav["weathermap-cacti-plugin.php:viewmapcycle"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");
+        $nav["weathermap-cacti-plugin.php:mrss"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");
+        $nav["weathermap-cacti-plugin.php:viewimage"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");
+        $nav["weathermap-cacti-plugin.php:viewthumb"] = array("title" => "Weathermap", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin.php", "level" => "1");
         $nav["weathermap-cacti-plugin-mgmt.php:"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         //   $nav["weathermap-cacti-plugin-mgmt.php:addmap_picker"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         $nav["weathermap-cacti-plugin-mgmt.php:viewconfig"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         $nav["weathermap-cacti-plugin-mgmt.php:addmap"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
-Line 271...
+Line 613...
         //  "graphs.php:graph_edit" => array("title" => "(Edit)", "mapping" => "index.php:,graphs.php:", "url" => "", "level" => "2"),
         $nav["weathermap-cacti-plugin-mgmt.php:perms_edit"] = array("title" => "Edit Permissions", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");
         $nav["weathermap-cacti-plugin-mgmt.php:addmap_picker"] = array("title" => "Add Map", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");
+        $nav["weathermap-cacti-plugin-mgmt.php:map_settings"] = array("title" => "Map Settings", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");
+        $nav["weathermap-cacti-plugin-mgmt.php:map_settings_form"] = array("title" => "Map Settings", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");
+        $nav["weathermap-cacti-plugin-mgmt.php:map_settings_delete"] = array("title" => "Map Settings", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");
+        $nav["weathermap-cacti-plugin-mgmt.php:map_settings_update"] = array("title" => "Map Settings", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");
+        $nav["weathermap-cacti-plugin-mgmt.php:map_settings_add"] = array("title" => "Map Settings", "mapping" => "index.php:,weathermap-cacti-plugin-mgmt.php:", "url" => "", "level" => "2");
         // $nav["weathermap-cacti-plugin-mgmt.php:perms_edit"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         $nav["weathermap-cacti-plugin-mgmt.php:perms_add_user"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         $nav["weathermap-cacti-plugin-mgmt.php:perms_delete_user"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         $nav["weathermap-cacti-plugin-mgmt.php:delete_map"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         $nav["weathermap-cacti-plugin-mgmt.php:move_map_down"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         $nav["weathermap-cacti-plugin-mgmt.php:move_map_up"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
+        $nav["weathermap-cacti-plugin-mgmt.php:move_group_down"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
+        $nav["weathermap-cacti-plugin-mgmt.php:move_group_up"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
+        $nav["weathermap-cacti-plugin-mgmt.php:group_form"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
+        $nav["weathermap-cacti-plugin-mgmt.php:group_update"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         $nav["weathermap-cacti-plugin-mgmt.php:activate_map"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         $nav["weathermap-cacti-plugin-mgmt.php:deactivate_map"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         $nav["weathermap-cacti-plugin-mgmt.php:rebuildnow"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
+        $nav["weathermap-cacti-plugin-mgmt.php:rebuildnow2"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
+        $nav["weathermap-cacti-plugin-mgmt.php:chgroup"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
+        $nav["weathermap-cacti-plugin-mgmt.php:chgroup_update"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
+        $nav["weathermap-cacti-plugin-mgmt.php:groupadmin"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
+        $nav["weathermap-cacti-plugin-mgmt.php:groupadmin_delete"] = array("title" => "Weathermap Management", "mapping" => "index.php:", "url" => "weathermap-cacti-plugin-mgmt.php", "level" => "1");
         return $nav;
 }
+function weathermap_poller_output($rrd_update_array) {
+        global $config;
+        // global $weathermap_debugging;
+        $logging = read_config_option("log_verbosity");
+        if($logging >= POLLER_VERBOSITY_DEBUG) cacti_log("WM poller_output: STARTING\n",true,"WEATHERMAP");
+        // partially borrowed from Jimmy Conner's THold plugin.
+        // (although I do things slightly differently - I go from filenames, and don't use the poller_interval)
+        // $requiredlist = db_fetch_assoc("select distinct weathermap_data.*, data_template_data.local_data_id, data_template_rrd.data_source_type_id from weathermap_data, data_template_data, data_template_rrd where weathermap_data.rrdfile=data_template_data.data_source_path and data_template_rrd.local_data_id=data_template_data.local_data_id");
+        // new version works with *either* a local_data_id or rrdfile in the weathermap_data table, and returns BOTH
+        $requiredlist = db_fetch_assoc("select distinct weathermap_data.id, weathermap_data.last_value, weathermap_data.last_time, weathermap_data.data_source_name, data_template_data.data_source_path, data_template_data.local_data_id, data_template_rrd.data_source_type_id from weathermap_data, data_template_data, data_template_rrd where weathermap_data.local_data_id=data_template_data.local_data_id and data_template_rrd.local_data_id=data_template_data.local_data_id and weathermap_data.local_data_id<>0;");
+        $path_rra = $config["rra_path"];
+        # especially on Windows, it seems that filenames are not reliable (sometimes \ and sometimes / even though path_rra is always /) .
+        # let's make an index from local_data_id to filename, and then use local_data_id as the key...
+        foreach (array_keys($rrd_update_array) as $key)
+        {
+                if(isset( $rrd_update_array[$key]['times']) && is_array($rrd_update_array[$key]['times']) )
+                {
+                        # if($logging >= POLLER_VERBOSITY_DEBUG) cacti_log("WM poller_output: Adding $key",true,"WEATHERMAP");
+                        $knownfiles[ $rrd_update_array[$key]["local_data_id"] ] = $key;
+                }
+        }
+        foreach ($requiredlist as $required)
+        {
+                $file = str_replace("<path_rra>", $path_rra, $required['data_source_path']);
+                $dsname = $required['data_source_name'];
+                $local_data_id = $required['local_data_id'];
+                if(isset($knownfiles[$local_data_id]))
+                {
+                        $file2 = $knownfiles[$local_data_id];
+                        if($file2 != '') $file = $file2;
+                }
+            if($logging >= POLLER_VERBOSITY_DEBUG) cacti_log("WM poller_output: Looking for $file ($local_data_id) (".$required['data_source_path'].")\n",true,"WEATHERMAP");
+                if( isset($rrd_update_array[$file]) && is_array($rrd_update_array[$file]) && isset($rrd_update_array[$file]['times']) && is_array($rrd_update_array[$file]['times']) && isset( $rrd_update_array{$file}['times'][key($rrd_update_array[$file]['times'])]{$dsname} ) )
+                {
+                        $value = $rrd_update_array{$file}['times'][key($rrd_update_array[$file]['times'])]{$dsname};
+                        $time = key($rrd_update_array[$file]['times']);
+                        if (read_config_option("log_verbosity") >= POLLER_VERBOSITY_MEDIUM)
+                                cacti_log("WM poller_output: Got one! $file:$dsname -> $time $value\n",true,"WEATHERMAP");
+                        $period = $time - $required['last_time'];
+                        $lastval = $required['last_value'];
+                        // if the new value is a NaN, we'll give 0 instead, and pretend it didn't happen from the point
+                        // of view of the counter etc. That way, we don't get those enormous spikes. Still doesn't deal with
+                        // reboots very well, but it should improve it for drops.
+                        if($value == 'U')
+                        {
+                                $newvalue = 0;
+                                $newlastvalue = $lastval;
+                                $newtime = $required['last_time'];
+                        }
+                        else
+                        {
+                                $newlastvalue = $value;
+                                $newtime = $time;
+                                switch($required['data_source_type_id'])
+                                {
+                                        case 1: //GAUGE
+                                                $newvalue = $value;
+                                                break;
+                                        case 2: //COUNTER
+                                                if ($value >= $lastval) {
+                                                        // Everything is normal
+                                                        $newvalue = $value - $lastval;
+                                                } else {
+                                                        // Possible overflow, see if its 32bit or 64bit
+                                                        if ($lastval > 4294967295) {
+                                                                $newvalue = (18446744073709551615 - $lastval) + $value;
+                                                        } else {
+                                                                $newvalue = (4294967295 - $lastval) + $value;
+                                                        }
+                                                }
+                                                $newvalue = $newvalue / $period;
+                                                break;
+                                        case 3: //DERIVE
+                                                $newvalue = ($value-$lastval) / $period;
+                                                break;
+                                        case 4: //ABSOLUTE
+                                                $newvalue = $value / $period;
+                                                break;
+                                        default: // do something somewhat sensible in case something odd happens
+                                                $newvalue = $value;
+                                                warn("poller_output found an unknown data_source_type_id for $file:$dsname");
+                                                break;
+                                }
+                        }
+                        db_execute("UPDATE weathermap_data SET last_time=$newtime, last_calc='$newvalue', last_value='$newlastvalue',sequence=sequence+1  where id = " . $required['id']);
+                        if($logging >= POLLER_VERBOSITY_DEBUG) cacti_log("WM poller_output: Final value is $newvalue (was $lastval, period was $period)\n",true,"WEATHERMAP");
+                }
+                else
+                {
+                        if(1==0 && $logging >= POLLER_VERBOSITY_DEBUG)
+                        {
+                        #       cacti_log("WM poller_output: ENDING\n",true,"WEATHERMAP");
+                                cacti_log("WM poller_output: Didn't find it.\n",true,"WEATHERMAP");
+                                cacti_log("WM poller_output: DID find these:\n",true,"WEATHERMAP");
+                                foreach (array_keys($rrd_update_array) as $key)
+                                {
+                                        $local_data_id = $rrd_update_array[$key]["local_data_id"];
+                                        cacti_log("WM poller_output:    $key ($local_data_id)\n",true,"WEATHERMAP");
+                                }
+                        }
+                }
+        }
+        if($logging >= POLLER_VERBOSITY_DEBUG) cacti_log("WM poller_output: ENDING\n",true,"WEATHERMAP");
+        return $rrd_update_array;
+}
-function weathermap_poller_bottom () {
+function weathermap_poller_bottom() {
         global $config;
         global $weathermap_debugging, $WEATHERMAP_VERSION;
         include_once($config["library_path"] . DIRECTORY_SEPARATOR."database.php");
         include_once(dirname(__FILE__).DIRECTORY_SEPARATOR."lib".DIRECTORY_SEPARATOR."poller-common.php");
-Line 309...
+Line 794...
                 return;
         }
         else
         {
                 // if we're due, run the render updates
-                if( ($rendercounter % $renderperiod) == 0)
+                if( ( $renderperiod == 0) || ( ($rendercounter % $renderperiod) == 0) )
                 {
                         weathermap_run_maps(dirname(__FILE__) );
                 }
                 else
                 {