Skip to content

fix incorrect include path in plugin_hook #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheWitness merged 2 commits into from
May 1, 2026
+10 −7
Merged

fix incorrect include path in plugin_hook #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5931bc
fix incorrect include path in plugin_hook
xmacan May 1, 2026
b5ca82f
update
xmacan May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion include/database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand All @@ -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 = ?
Expand Down
12 changes: 6 additions & 6 deletions setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading