diff --git a/CHANGELOG.md b/CHANGELOG.md index 0157a72..ea95ece 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * issue#327: Move Timespan from action menu * issue#330: Fix cannot add favourite graph to dashboard * issue#344: Fix navigation +* issue#369: Fix invalid paths in plugin_hooks * issue: Fix support for Cacti 1.3+ * issue: Intropage was not remembering the users desired panel order * issue: When 'Important First' is set, do a full refresh diff --git a/include/database.php b/include/database.php index 8d39bbe..d4951f0 100644 --- a/include/database.php +++ b/include/database.php @@ -313,7 +313,7 @@ function intropage_upgrade_database() { api_plugin_db_table_create('intropage', 'plugin_intropage_user_group_auth', $data); api_plugin_register_hook('intropage', 'user_group_admin_tab', 'intropage_user_group_admin_tab', 'include/settings.php', '1'); - api_plugin_register_hook('intropage', 'user_group_admin_run_action', 'intropage_user_group_admin_run_action', 'includes/settings.php', '1'); + api_plugin_register_hook('intropage', 'user_group_admin_run_action', 'intropage_user_group_admin_run_action', 'include/settings.php', '1'); api_plugin_register_hook('intropage', 'user_group_admin_save', 'intropage_user_group_admin_save', 'include/settings.php', '1'); api_plugin_register_hook('intropage', 'user_group_remove', 'intropage_user_group_remove', 'setup.php', '1'); } @@ -323,8 +323,10 @@ function intropage_upgrade_database() { ADD COLUMN `height` enum("normal","double","triple") NOT NULL DEFAULT "normal"'); db_execute('ALTER TABLE plugin_intropage_panel_data ADD COLUMN `height` enum("normal","double","triple") NOT NULL DEFAULT "normal"'); + db_execute("UPDATE plugin_hooks SET file='include/settings.php' WHERE name='intropage' AND file='includes/settings.php'"); } + // Set the new version db_execute_prepared("UPDATE plugin_config SET version = ?, author = ?, webpage = ? diff --git a/setup.php b/setup.php index 007f298..83ade55 100644 --- a/setup.php +++ b/setup.php @@ -43,18 +43,18 @@ function plugin_intropage_install() { api_plugin_register_hook('intropage', 'poller_bottom', 'intropage_poller_bottom', 'setup.php'); // user and user group hooks - api_plugin_register_hook('intropage', 'user_admin_tab', 'intropage_user_admin_tab', 'includes/settings.php'); - api_plugin_register_hook('intropage', 'user_admin_run_action', 'intropage_user_admin_run_action', 'includes/settings.php'); - api_plugin_register_hook('intropage', 'user_admin_user_save', 'intropage_user_admin_user_save', 'includes/settings.php'); + api_plugin_register_hook('intropage', 'user_admin_tab', 'intropage_user_admin_tab', 'include/settings.php'); + api_plugin_register_hook('intropage', 'user_admin_run_action', 'intropage_user_admin_run_action', 'include/settings.php'); + api_plugin_register_hook('intropage', 'user_admin_user_save', 'intropage_user_admin_user_save', 'include/settings.php'); api_plugin_register_hook('intropage', 'user_remove', 'intropage_user_remove', 'setup.php'); api_plugin_register_hook('intropage', 'user_group_admin_tab', 'intropage_user_group_admin_tab', 'include/settings.php'); - api_plugin_register_hook('intropage', 'user_group_admin_run_action', 'intropage_user_group_admin_run_action', 'includes/settings.php'); + api_plugin_register_hook('intropage', 'user_group_admin_run_action', 'intropage_user_group_admin_run_action', 'include/settings.php'); api_plugin_register_hook('intropage', 'user_group_admin_save', 'intropage_user_group_admin_save', 'include/settings.php'); api_plugin_register_hook('intropage', 'user_group_remove', 'intropage_user_group_remove', 'setup.php'); // default permission for new user - api_plugin_register_hook('intropage', 'copy_user', 'intropage_copy_user', 'includes/settings.php'); - api_plugin_register_hook('intropage', 'user_admin_setup_sql_save', 'intropage_user_admin_setup_sql_save', 'includes/settings.php'); + api_plugin_register_hook('intropage', 'copy_user', 'intropage_copy_user', 'include/settings.php'); + api_plugin_register_hook('intropage', 'user_admin_setup_sql_save', 'intropage_user_admin_setup_sql_save', 'include/settings.php'); api_plugin_register_realm('intropage', 'intropage.php', 'Intropage Viewer', 1); api_plugin_register_realm('intropage', 'intropage_admin.php', 'Intropage Administration', 1);