Changeset 139

Timestamp:

04/05/08 18:35:40 (5 years ago)

Author:

divagater

Message:

Updated setup.php to support PA 2.x. Added svn:keywords

Location:

trunk

Files:

• config.php (modified) (1 prop)
• controllers/cacti.php (modified) (1 prop)
• controllers/commands.php (modified) (1 prop)
• controllers/comments.php (modified) (1 diff, 1 prop)
• controllers/controller.php (modified) (1 diff, 1 prop)
• controllers/downtime.php (modified) (1 diff, 1 prop)
• controllers/hostgroups.php (modified) (1 diff, 1 prop)
• controllers/hosts.php (modified) (1 diff, 1 prop)
• controllers/layout.php (modified) (1 prop)
• controllers/layoutDev.php (modified) (1 prop)
• controllers/logentries.php (modified) (1 diff, 1 prop)
• controllers/nagios.php (modified) (1 diff, 1 prop)
• controllers/notifications.php (modified) (1 diff, 1 prop)
• controllers/servicegroups.php (modified) (1 diff, 1 prop)
• controllers/services.php (modified) (1 diff, 1 prop)
• controllers/settings.php (modified) (1 diff, 1 prop)
• controllers/statehistory.php (modified) (1 diff, 1 prop)
• controllers/sync.php (modified) (1 diff, 1 prop)
• index.php (modified) (1 prop)
• js/src/Portal.js (modified) (1 prop)
• js/src/PortalColumn.js (modified) (1 prop)
• js/src/Portlet.js (modified) (1 prop)
• js/src/monitoring/commandForms.js (modified) (1 prop)
• js/src/monitoring/comments.js (modified) (1 prop)
• js/src/monitoring/downtime.js (modified) (1 prop)
• js/src/monitoring/eventLog.js (modified) (1 prop)
• js/src/monitoring/n2c.js (modified) (1 prop)
• js/src/monitoring/processInfo.js (modified) (1 prop)
• js/src/monitoring/reporting.js (modified) (1 prop)
• js/src/npc.js (modified) (1 prop)
• js/src/overrides/overrides.js (modified) (1 prop)
• js/src/plugins/Ext.state.HttpProvider.js (modified) (1 prop)
• js/src/plugins/Ext.ux.form.XCheckbox.js (modified) (1 diff, 1 prop)
• js/src/plugins/Ext.ux.grid.Search.js (modified) (1 diff, 1 prop)
• js/src/portlets/eventlog-portlet.js (modified) (1 prop)
• js/src/portlets/host-problems-portlet.js (modified) (1 prop)
• js/src/portlets/host-summary-portlet.js (modified) (1 prop)
• js/src/portlets/hostgroup-host-status-portlet.js (modified) (1 prop)
• js/src/portlets/hostgroup-service-status-portlet.js (modified) (1 prop)
• js/src/portlets/monitoring-performance-portlet.js (modified) (1 prop)
• js/src/portlets/service-problems-portlet.js (modified) (1 prop)
• js/src/portlets/service-summary-portlet.js (modified) (1 prop)
• js/src/portlets/servicegroup-host-status-portlet.js (modified) (1 prop)
• js/src/portlets/servicegroup-service-status-portlet.js (modified) (1 prop)
• models/NpcAcknowledgements.php (modified) (1 prop)
• models/NpcCommands.php (modified) (1 prop)
• models/NpcCommenthistory.php (modified) (1 prop)
• models/NpcComments.php (modified) (1 prop)
• models/NpcConfigfiles.php (modified) (1 prop)
• models/NpcConfigfilevariables.php (modified) (1 prop)
• models/NpcConninfo.php (modified) (1 prop)
• models/NpcContactAddresses.php (modified) (1 prop)
• models/NpcContactNotificationcommands.php (modified) (1 prop)
• models/NpcContactgroupMembers.php (modified) (1 prop)
• models/NpcContactgroups.php (modified) (1 prop)
• models/NpcContactnotificationmethods.php (modified) (1 prop)
• models/NpcContactnotifications.php (modified) (1 prop)
• models/NpcContacts.php (modified) (1 prop)
• models/NpcContactstatus.php (modified) (1 prop)
• models/NpcCustomvariables.php (modified) (1 prop)
• models/NpcCustomvariablestatus.php (modified) (1 prop)
• models/NpcDbversion.php (modified) (1 prop)
• models/NpcDowntimehistory.php (modified) (1 prop)
• models/NpcEventhandlers.php (modified) (1 prop)
• models/NpcExternalcommands.php (modified) (1 prop)
• models/NpcFlappinghistory.php (modified) (1 prop)
• models/NpcHostContactgroups.php (modified) (1 prop)
• models/NpcHostContacts.php (modified) (1 prop)
• models/NpcHostGraphs.php (modified) (1 prop)
• models/NpcHostParenthosts.php (modified) (1 prop)
• models/NpcHostchecks.php (modified) (1 prop)
• models/NpcHostdependencies.php (modified) (1 prop)
• models/NpcHostescalationContactgroups.php (modified) (1 prop)
• models/NpcHostescalationContacts.php (modified) (1 prop)
• models/NpcHostescalations.php (modified) (1 prop)
• models/NpcHostgroupMembers.php (modified) (1 prop)
• models/NpcHostgroups.php (modified) (1 prop)
• models/NpcHosts.php (modified) (1 prop)
• models/NpcHoststatus.php (modified) (1 prop)
• models/NpcInstances.php (modified) (1 prop)
• models/NpcLogentries.php (modified) (1 diff, 1 prop)
• models/NpcNotifications.php (modified) (1 prop)
• models/NpcObjects.php (modified) (1 prop)
• models/NpcProcessevents.php (modified) (1 diff, 1 prop)
• models/NpcProgramstatus.php (modified) (1 diff, 1 prop)
• models/NpcRuntimevariables.php (modified) (1 prop)
• models/NpcScheduleddowntime.php (modified) (1 prop)
• models/NpcServiceContactgroups.php (modified) (1 prop)
• models/NpcServiceContacts.php (modified) (1 prop)
• models/NpcServiceGraphs.php (modified) (1 prop)
• models/NpcServicechecks.php (modified) (1 prop)
• models/NpcServicedependencies.php (modified) (1 prop)
• models/NpcServiceescalationContactgroups.php (modified) (1 prop)
• models/NpcServiceescalationContacts.php (modified) (1 prop)
• models/NpcServiceescalations.php (modified) (1 prop)
• models/NpcServicegroupMembers.php (modified) (1 prop)
• models/NpcServicegroups.php (modified) (1 prop)
• models/NpcServices.php (modified) (1 diff, 1 prop)
• models/NpcServicestatus.php (modified) (1 prop)
• models/NpcSettings.php (modified) (1 prop)
• models/NpcStatehistory.php (modified) (1 prop)
• models/NpcSystemcommands.php (modified) (1 prop)
• models/NpcTimedeventqueue.php (modified) (1 prop)
• models/NpcTimedevents.php (modified) (1 prop)
• models/NpcTimeperiodTimeranges.php (modified) (1 prop)
• models/NpcTimeperiods.php (modified) (1 prop)
• nagioscmd.php (modified) (1 diff, 1 prop)
• npc.php (modified) (1 diff, 1 prop)
• perfdata.php (modified) (1 prop)
• setup.php (modified) (9 diffs, 1 prop)

trunk/controllers/comments.php

@@ -12 +12 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/controller.php

@@ -10 +10 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/downtime.php

@@ -12 +12 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/hostgroups.php

@@ -12 +12 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/hosts.php

@@ -12 +12 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/logentries.php

@@ -12 +12 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/nagios.php

@@ -14 +14 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/notifications.php

@@ -12 +12 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/servicegroups.php

@@ -12 +12 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/services.php

@@ -12 +12 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/settings.php

@@ -13 +13 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/statehistory.php

@@ -12 +12 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/controllers/sync.php

@@ -12 +12 @@
  * @subpackage          npc.controllers
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/js/src/plugins/Ext.ux.form.XCheckbox.js

@@ -3 +3 @@
   *
   * @author  Ing. Jozef Sakalos
-  * @version $Id: Ext.ux.form.XCheckbox.js 704 2008-02-11 04:49:11Z jozo $
+  * @version $Id$
   * @date    10. February 2008
   *

trunk/js/src/plugins/Ext.ux.grid.Search.js

@@ -7 +7 @@
  * @copyright (c) 2008, by Ing. Jozef Sakalos
  * @date      17. January 2008
- * @version   $Id: Ext.ux.grid.Search.js 634 2008-01-19 17:00:20Z jozo $
+ * @version   $Id$
  */
 

trunk/models/NpcLogentries.php

@@ -12 +12 @@
  * @subpackage          npc.models
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/models/NpcProcessevents.php

@@ -12 +12 @@
  * @subpackage          npc.models
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/models/NpcProgramstatus.php

@@ -12 +12 @@
  * @subpackage          npc.models
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/models/NpcServices.php

@@ -12 +12 @@
  * @subpackage          npc.models
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/nagioscmd.php

@@ -12 +12 @@
  * @package             npc
  * @since               NPC 2.0
- * @version             $Id: $
+ * @version             $Id$
  */
 

trunk/npc.php

@@ -1 +1 @@
 <?php
+
+/*
+ +-------------------------------------------------------------------------+
+ | Copyright (C) 2007 Billy Gunn aka divagater  (billy@gunn.org)           |
+ |                                                                         |
+ | This program is free software; you can redistribute it and/or           |
+ | modify it under the terms of the GNU General Public License (GPLv3)     |
+ | version 3 as published by the Free Software Foundation.                 |
+ |                                                                         |
+ | This program is distributed in the hope that it will be useful,         |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of          |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           |
+ | GNU General Public License for more details.                            |
+ +-------------------------------------------------------------------------+
+ | Cacti and Nagios are the copyright of their respective owners.          |
+ +-------------------------------------------------------------------------+
+*/
 
 chdir('../../');

trunk/setup.php

@@ -1 +1 @@
 <?php
+/* $Id:$ */
 /*
  +-------------------------------------------------------------------------+
@@ -20 +21 @@
 */
 
-function plugin_init_npc() {
-    global $plugin_hooks;
-    $plugin_hooks['top_header_tabs']['npc'] = 'npc_show_tab';
-    $plugin_hooks['top_graph_header_tabs']['npc'] = 'npc_show_tab';
-    $plugin_hooks['config_arrays']['npc'] = 'npc_config_arrays';
-    $plugin_hooks['draw_navigation_text']['npc'] = 'npc_draw_navigation_text';
-    $plugin_hooks['config_form']['npc'] = 'npc_config_form';
-    $plugin_hooks['api_device_save']['npc'] = 'npc_api_device_save';
-    $plugin_hooks['top_graph_refresh']['npc'] = 'npc_top_graph_refresh';
-    $plugin_hooks['config_settings']['npc'] = 'npc_config_settings';
+/**
+ * Called after install
+ *
+ * if return true, plugin will be installed but disabled
+ * if return false, plugin will be waiting configuration
+ *
+ * @return  bool
+ */
+function plugin_npc_check_config () {
+    return true;
 }
 
+/**
+ * compatibility for plugin update
+ */
 function npc_version () {
+    return plugin_npc_version ();
+}
+
+/**
+ * Version information
+ */
+function plugin_npc_version () {
     return array(   'name'          => 'npc',
-                    'version'       => '2.0.0a',
+                    'version'       => '2.0.0a-136',
                     'longname'      => 'Nagios plugin for Cacti',
                     'author'        => 'Billy Gunn',
@@ -43 +54 @@
 }
 
+function plugin_npc_install () {
+
+    npc_setup_tables();
+
+    api_plugin_register_realm ('npc', 'npc.php', 'Use NPC', 1);
+
+    // setup all arrays needed for npc
+    api_plugin_register_hook ('npc', 'config_arrays', 'npc_config_arrays', 'setup.php');
+
+    // Add the npc tab
+    api_plugin_register_hook ('npc', 'top_header_tabs', 'npc_show_tab', 'setup.php');
+    api_plugin_register_hook ('npc', 'top_graph_header_tabs', 'npc_show_tab', 'setup.php');
+
+    // Provide navigation texts
+    api_plugin_register_hook ('npc', 'draw_navigation_text', 'npc_draw_navigation_text', 'setup.php');
+
+    // Add Nagios host mapping select box
+    api_plugin_register_hook ('npc', 'config_form', 'npc_config_form', 'setup.php');
+
+    // Saves the selection from the host mapping select box
+    api_plugin_register_hook ('npc', 'api_device_save', 'npc_api_device_save', 'setup.php');
+
+    // Alter the page refresh rate
+    api_plugin_register_hook ('npc', 'top_graph_refresh', 'npc_top_graph_refresh', 'setup.php');
+
+    // Add a npc tab to the settings page
+    api_plugin_register_hook ('npc', 'config_settings', 'npc_config_settings', 'setup.php');
+}
+
+/**
+ * Remove all NPC database changes
+ */
+function plugin_npc_uninstall () {
+
+    // Drop all npc tables
+    db_execute("DROP TABLE `npc_acknowledgements`");
+    db_execute("DROP TABLE `npc_commands`");
+    db_execute("DROP TABLE `npc_commenthistory`");
+    db_execute("DROP TABLE `npc_comments`");
+    db_execute("DROP TABLE `npc_configfiles`");
+    db_execute("DROP TABLE `npc_configfilevariables`");
+    db_execute("DROP TABLE `npc_conninfo`");
+    db_execute("DROP TABLE `npc_contact_addresses`");
+    db_execute("DROP TABLE `npc_contact_notificationcommands`");
+    db_execute("DROP TABLE `npc_contactgroup_members`");
+    db_execute("DROP TABLE `npc_contactgroups`");
+    db_execute("DROP TABLE `npc_contactnotificationmethods`");
+    db_execute("DROP TABLE `npc_contactnotifications`");
+    db_execute("DROP TABLE `npc_contacts`");
+    db_execute("DROP TABLE `npc_contactstatus`");
+    db_execute("DROP TABLE `npc_customvariables`");
+    db_execute("DROP TABLE `npc_customvariablestatus`");
+    db_execute("DROP TABLE `npc_dbversion`");
+    db_execute("DROP TABLE `npc_downtimehistory`");
+    db_execute("DROP TABLE `npc_eventhandlers`");
+    db_execute("DROP TABLE `npc_externalcommands`");
+    db_execute("DROP TABLE `npc_flappinghistory`");
+    db_execute("DROP TABLE `npc_host_contactgroups`");
+    db_execute("DROP TABLE `npc_host_contacts`");
+    db_execute("DROP TABLE `npc_host_graphs`");
+    db_execute("DROP TABLE `npc_host_parenthosts`");
+    db_execute("DROP TABLE `npc_hostchecks`");
+    db_execute("DROP TABLE `npc_hostdependencies`");
+    db_execute("DROP TABLE `npc_hostescalation_contactgroups`");
+    db_execute("DROP TABLE `npc_hostescalation_contacts`");
+    db_execute("DROP TABLE `npc_hostescalations`");
+    db_execute("DROP TABLE `npc_hostgroup_members`");
+    db_execute("DROP TABLE `npc_hostgroups`");
+    db_execute("DROP TABLE `npc_hosts`");
+    db_execute("DROP TABLE `npc_hoststatus`");
+    db_execute("DROP TABLE `npc_instances`");
+    db_execute("DROP TABLE `npc_logentries`");
+    db_execute("DROP TABLE `npc_notifications`");
+    db_execute("DROP TABLE `npc_objects`");
+    db_execute("DROP TABLE `npc_processevents`");
+    db_execute("DROP TABLE `npc_programstatus`");
+    db_execute("DROP TABLE `npc_runtimevariables`");
+    db_execute("DROP TABLE `npc_scheduleddowntime`");
+    db_execute("DROP TABLE `npc_service_contactgroups`");
+    db_execute("DROP TABLE `npc_service_contacts`");
+    db_execute("DROP TABLE `npc_service_graphs`");
+    db_execute("DROP TABLE `npc_servicechecks`");
+    db_execute("DROP TABLE `npc_servicedependencies`");
+    db_execute("DROP TABLE `npc_serviceescalation_contactgroups`");
+    db_execute("DROP TABLE `npc_serviceescalation_contacts`");
+    db_execute("DROP TABLE `npc_serviceescalations`");
+    db_execute("DROP TABLE `npc_servicegroup_members`");
+    db_execute("DROP TABLE `npc_servicegroups`");
+    db_execute("DROP TABLE `npc_services`");
+    db_execute("DROP TABLE `npc_servicestatus`");
+    db_execute("DROP TABLE `npc_settings`");
+    db_execute("DROP TABLE `npc_statehistory`");
+    db_execute("DROP TABLE `npc_systemcommands`");
+    db_execute("DROP TABLE `npc_timedeventqueue`");
+    db_execute("DROP TABLE `npc_timedevents`");
+    db_execute("DROP TABLE `npc_timeperiod_timeranges`");
+    db_execute("DROP TABLE `npc_timeperiods`");
+
+    db_execute("ALTER TABLE `host` DROP `npc_host_object_id`");
+    db_execute("DELETE FROM `settings` WHERE `name` like 'npc\_%'");
+  
+    api_plugin_remove_realms ('npc');
+}
+
+/**
+ * Set the page refresh very high
+ */
 function npc_top_graph_refresh() {
-    // Don't want to refresh so set very high
     return('2592000');
 }
@@ -53 +170 @@
     global $npc_default_settings, $npc_log_level;
 
-    $user_auth_realms[32]='View NPC';
-    $user_auth_realm_filenames['npc.php'] = 32;
-    $user_auth_realm_filenames['test.php'] = 32;
-    $user_auth_realm_filenames['npc_layout.php'] = 32;
-    $user_auth_realm_filenames['npc_service_detail.php'] = 32;
-
-    $npc_log_level = array(
-        "0" => "None",
-        "1" => "ERROR - Log errors only",
-        "2" => "WARN  - Log errors and warnings",
-        "3" => "INFO  - Log errors, warnings, and info messages",
-        "4" => "DEBUG - Log everything"
-    );
-
-    $npc_date_format = array(
-        "Y-m-d" => "2007-12-27",
-        "m-d-Y" => "12-27-2007",
-        "d-m-Y" => "27-12-2007",
-        "Y/m/d" => "2007/12/27",
-        "m/d/Y" => "12/27/2007",
-        "d/m/Y" => "27/12/2007",
-        "Y.m.d" => "2007.12.27",
-        "d.m.Y" => "27.12.2007",
-        "m.d.Y" => "12.27.2007"
-    );
-
-    $npc_time_format = array(
-        "H:i:s"  => "23:07",
-        "h:i:sa" => "11:07pm",
-        "h:i:sA" => "11:07PM",
-        "H.i.s"  => "23.07",
-        "h.i.sa" => "11.07pm",
-        "h.i.sA" => "11.07PM"
-    );
-
-    $npc_default_settings = array(
-        'date_format' => "s%3AY-m-d",
-        'time_format' => "s%3AH%3Ai%3As",
-
-        "serviceProblems" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol1%5Ehidden%3Db%253A0%5Eindex%3Ds%253A0%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
-        "serviceSummary" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol1%5Ehidden%3Db%253A0%5Eindex%3Ds%253A1%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
-        "servicegroupServiceStatus" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol1%5Ehidden%3Db%253A0%5Eindex%3Ds%253A2%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
-        "servicegroupHostStatus" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol1%5Ehidden%3Db%253A0%5Eindex%3Ds%253A3%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
-        "monitoringPerf" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol1%5Ehidden%3Db%253A1%5Eindex%3Ds%253A4%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
-
-        "hostProblems" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol2%5Ehidden%3Db%253A0%5Eindex%3Ds%253A0%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
-        "hostSummary" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol2%5Ehidden%3Db%253A0%5Eindex%3Ds%253A1%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
-        "hostgroupServiceStatus" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol2%5Ehidden%3Db%253A0%5Eindex%3Ds%253A2%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
-        "hostgroupHostStatus" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol2%5Ehidden%3Db%253A0%5Eindex%3Ds%253A3%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
-        "eventLog" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol2%5Ehidden%3Db%253A1%5Eindex%3Ds%253A4%5Erefresh%3Dn%253A60%5Erows%3Dn%253A5'
-    );
-
+      if (isset($_SESSION["sess_user_id"])) {
+
+        $user_id=$_SESSION["sess_user_id"];
+
+        $npc_realm = db_fetch_cell("SELECT id FROM plugin_config WHERE directory = 'npc'");
+        $npc_enabled = db_fetch_cell("SELECT status FROM plugin_config WHERE directory = 'npc'");
+
+        if ($npc_enabled == "1") {
+
+            $user_auth_realm_filenames['npc.php'] = 9000 + $npc_realm;
+
+            $npc_log_level = array(
+                "0" => "None",
+                "1" => "ERROR - Log errors only",
+                "2" => "WARN  - Log errors and warnings",
+                "3" => "INFO  - Log errors, warnings, and info messages",
+                "4" => "DEBUG - Log everything"
+            );
+
+            $npc_date_format = array(
+                "Y-m-d" => "2007-12-27",
+                "m-d-Y" => "12-27-2007",
+                "d-m-Y" => "27-12-2007",
+                "Y/m/d" => "2007/12/27",
+                "m/d/Y" => "12/27/2007",
+                "d/m/Y" => "27/12/2007",
+                "Y.m.d" => "2007.12.27",
+                "d.m.Y" => "27.12.2007",
+                "m.d.Y" => "12.27.2007"
+            );
+
+            $npc_time_format = array(
+                "H:i:s"  => "23:07",
+                "h:i:sa" => "11:07pm",
+                "h:i:sA" => "11:07PM",
+                "H.i.s"  => "23.07",
+                "h.i.sa" => "11.07pm",
+                "h.i.sA" => "11.07PM"
+            );  
+
+            // Initial settings for server side state handling
+            $npc_default_settings = array(
+                'date_format' => "s%3AY-m-d",
+                'time_format' => "s%3AH%3Ai%3As",
+
+                "serviceProblems" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol1%5Ehidden%3Db%253A0%5Eindex%3Ds%253A0%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
+                "serviceSummary" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol1%5Ehidden%3Db%253A0%5Eindex%3Ds%253A1%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
+                "servicegroupServiceStatus" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol1%5Ehidden%3Db%253A0%5Eindex%3Ds%253A2%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
+                "servicegroupHostStatus" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol1%5Ehidden%3Db%253A0%5Eindex%3Ds%253A3%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
+                "monitoringPerf" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol1%5Ehidden%3Db%253A1%5Eindex%3Ds%253A4%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
+
+                "hostProblems" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol2%5Ehidden%3Db%253A0%5Eindex%3Ds%253A0%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
+                "hostSummary" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol2%5Ehidden%3Db%253A0%5Eindex%3Ds%253A1%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
+                "hostgroupServiceStatus" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol2%5Ehidden%3Db%253A0%5Eindex%3Ds%253A2%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
+                "hostgroupHostStatus" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol2%5Ehidden%3Db%253A0%5Eindex%3Ds%253A3%5Erefresh%3Dn%253A60%5Erows%3Dn%253A10',
+                "eventLog" => 'o%3Acollapsed%3Db%253A0%5Ecolumn%3Ds%253Adashcol2%5Ehidden%3Db%253A1%5Eindex%3Ds%253A4%5Erefresh%3Dn%253A60%5Erows%3Dn%253A5'
+            );
+
+            api_plugin_load_realms();
+        }
+    }
 }
 
@@ -147 +273 @@
 }
 
-function npc_setup_table () {
-    global $config, $database_default, $npc_default_settings;
+function npc_setup_tables() {
+    global $config, $database_default;
 
     include_once($config["library_path"] . "/database.php");
@@ -1326 +1452 @@
     } else {
 
-        $cUser = db_fetch_assoc('SELECT id FROM user_auth');
-        $nUser = db_fetch_assoc('SELECT user_id FROM npc_settings');
-
-        // Add exitsting users to npc_settings
-        for ($i = 0; $i < count($cUser); $i++) {
-            if (!db_fetch_cell('SELECT user_id FROM npc_settings WHERE user_id = ' . $cUser[$i]['id'])) {
-                db_execute("INSERT INTO npc_settings VALUES(". $cUser[$i]['id'].",'".serialize($npc_default_settings)."')");
-            }
-        }
-
-        // Delete non existent users from npc_settings
-        for ($i = 0; $i < count($nUser); $i++) {
-            if (isset($nUser[$i]['id']) && !db_fetch_cell('SELECT id FROM user_auth WHERE id = ' . $nUser[$i]['id'])) {
-                db_execute('DELETE FROM npc_settings WHERE user_id = ' . $nUser[$i]['id']);
-            }
-        }
     }
 
@@ -1352 +1462 @@
 
 function npc_show_tab() {
-        global $config;
-        if (api_user_realm_auth('npc.php')) {
-            $cp = false;
-            if (basename($_SERVER["PHP_SELF"]) == "npc.php")
-                $cp = true;
-
-            print '<a href="' . $config['url_path'] . 'plugins/npc/npc.php"><img src="' 
-                  . $config['url_path'] . 'plugins/npc/images/tab_npc' 
-                  . ($cp ? "_down": "") . '.gif" alt="npc" align="absmiddle" border="0"></a>';
+    global $config;
+
+    if (isset($_SESSION["sess_user_id"])) {
+  
+        $user_id = $_SESSION["sess_user_id"];
+
+        $npc_realm = db_fetch_cell("SELECT id FROM plugin_config WHERE directory = 'npc'");
+        $npc_enabled = db_fetch_cell("SELECT status FROM plugin_config WHERE directory = 'npc'");
+
+        if ($npc_enabled == "1") {
+            if (api_user_realm_auth('npc.php')) {
+                $cp = false;
+                if (basename($_SERVER["PHP_SELF"]) == "npc.php") { $cp = true; }
+
+                print '<a href="' . $config['url_path'] . 'plugins/npc/npc.php"><img src="' 
+                     . $config['url_path'] . 'plugins/npc/images/tab_npc' 
+                     . ($cp ? "_down": "") . '.gif" alt="npc" align="absmiddle" border="0"></a>';
+            }
         }
-        npc_check_upgrade ();
+    }
 }
 
-function npc_check_upgrade() {
-    $current = npc_version ();
-    $current = $current['version'];
-    $old = read_config_option('plugin_npc_version');
-    //if ($current != $old) {
-        npc_setup_table ();
-    //}
-}
-
-
 function npc_config_settings() {
 
-        global $tabs, $settings, $npc_date_format, $npc_time_format, $npc_log_level;
-
-        $tabs["npc"] = " NPC ";
-
-        $settings['npc'] = array(
+    global $tabs, $settings, $npc_date_format, $npc_time_format, $npc_log_level, $npc_default_settings;
+
+    if (isset($_SESSION["sess_user_id"])) {
+  
+        $user_id = $_SESSION["sess_user_id"];
+
+        $npc_realm = db_fetch_cell("SELECT id FROM plugin_config WHERE directory = 'npc'");
+        $npc_enabled = db_fetch_cell("SELECT status FROM plugin_config WHERE directory = 'npc'");
+
+        if ($npc_enabled == "1") {
+
+            $tabs["npc"] = " NPC ";
+
+            $cUser = db_fetch_assoc('SELECT id FROM user_auth');
+            $nUser = db_fetch_assoc('SELECT user_id FROM npc_settings');
+
+            // Add exitsting users to npc_settings
+            for ($i = 0; $i < count($cUser); $i++) {
+                if (!db_fetch_cell('SELECT user_id FROM npc_settings WHERE user_id = ' . $cUser[$i]['id'])) {
+                    db_execute("INSERT INTO npc_settings VALUES(". $cUser[$i]['id'].",'".serialize($npc_default_settings)."')");
+                }
+            }
+
+            // Delete non existent users from npc_settings
+            for ($i = 0; $i < count($nUser); $i++) {
+                if (isset($nUser[$i]['id']) && !db_fetch_cell('SELECT id FROM user_auth WHERE id = ' . $nUser[$i]['id'])) {
+                    db_execute('DELETE FROM npc_settings WHERE user_id = ' . $nUser[$i]['id']);
+                }
+            }
+
+            $settings['npc'] = array(
                 "npc_header" => array(
-                        "friendly_name" => "General Settings",
-                        "method" => "spacer",
+                    "friendly_name" => "General Settings",
+                    "method" => "spacer",
                 ),
                 "npc_nagios_commands" => array(
-                        "friendly_name" => "Remote Commands",
-                        "description" => "Allow commands to be written to the Nagios command file.",
-                        "method" => "checkbox",
+                    "friendly_name" => "Remote Commands",
+                    "description" => "Allow commands to be written to the Nagios command file.",
+                    "method" => "checkbox",
                 ),
                 "npc_nagios_cmd_path" => array(
-                        "friendly_name" => "Nagios Command File Path",
-                        "description" => "The path to the Nagios command file (nagios.cmd).",
-                        "method" => "textbox",
-                        "max_length" => 255,
-                ),
+                    "friendly_name" => "Nagios Command File Path",
+                    "description" => "The path to the Nagios command file (nagios.cmd).",
+                    "method" => "textbox",
+                    "max_length" => 255,
+                ),  
                 "npc_nagios_url" => array(
-                        "friendly_name" => "Nagios URL",
-                        "description" => "The full URL to your Nagios installation (http://nagios.company.com/nagios/)",
-                        "method" => "textbox",
-                        "max_length" => 255,
+                    "friendly_name" => "Nagios URL",
+                    "description" => "The full URL to your Nagios installation (http://nagios.company.com/nagios/)",
+                    "method" => "textbox",
+                    "max_length" => 255,
                 ),
                 "npc_date_format" => array(
@@ -1418 +1553 @@
                 ),
                 "npc_logging_header" => array(
-                        "friendly_name" => "Logging",
-                        "method" => "spacer",
+                    "friendly_name" => "Logging",
+                    "method" => "spacer",
                 ),
                 "npc_log_level" => array(
@@ -1428 +1563 @@
                     "array" => $npc_log_level,
                 )
-        );
+            );
+        }
+    }
 }