Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
ISPConfig 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Helmo
ISPConfig 3
Commits
07bf1285
Commit
07bf1285
authored
11 years ago
by
Till Brehm
Browse files
Options
Downloads
Plain Diff
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
parents
dce3bb51
ab6e698f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
server/lib/classes/plugins.inc.php
+1
-1
1 addition, 1 deletion
server/lib/classes/plugins.inc.php
server/server.php
+3
-0
3 additions, 0 deletions
server/server.php
with
4 additions
and
1 deletion
server/lib/classes/plugins.inc.php
+
1
−
1
View file @
07bf1285
...
@@ -134,7 +134,7 @@ class plugins {
...
@@ -134,7 +134,7 @@ class plugins {
function
registerAction
(
$action_name
,
$plugin_name
,
$function_name
)
{
function
registerAction
(
$action_name
,
$plugin_name
,
$function_name
)
{
global
$app
;
global
$app
;
$this
->
subscribed_actions
[
$action_name
][]
=
array
(
'plugin'
=>
$plugin_name
,
'function'
=>
$function_name
);
$this
->
subscribed_actions
[
$action_name
][]
=
array
(
'plugin'
=>
$plugin_name
,
'function'
=>
$function_name
);
if
(
$this
->
debug
)
$app
->
log
(
"Registered function '
$function_name
' from plugin '
$plugin_name
' for action '
$
event
_name
'."
,
LOGLEVEL_DEBUG
);
if
(
$this
->
debug
)
$app
->
log
(
"Registered function '
$function_name
' from plugin '
$plugin_name
' for action '
$
action
_name
'."
,
LOGLEVEL_DEBUG
);
}
}
...
...
This diff is collapsed.
Click to expand it.
server/server.php
+
3
−
0
View file @
07bf1285
...
@@ -172,6 +172,9 @@ if ($app->db->connect_error == NULL && $app->dbmaster->connect_error == NULL) {
...
@@ -172,6 +172,9 @@ if ($app->db->connect_error == NULL && $app->dbmaster->connect_error == NULL) {
$app
->
modules
->
loadModules
(
'all'
);
$app
->
modules
->
loadModules
(
'all'
);
//** Load the plugins that are in the plugins-enabled folder
//** Load the plugins that are in the plugins-enabled folder
$app
->
plugins
->
loadPlugins
(
'all'
);
$app
->
plugins
->
loadPlugins
(
'all'
);
$app
->
plugins
->
raiseAction
(
'server_plugins_loaded'
,
''
);
if
(
$tmp_num_records
>
0
)
{
if
(
$tmp_num_records
>
0
)
{
$app
->
log
(
"Found
$tmp_num_records
changes, starting update process."
,
LOGLEVEL_DEBUG
);
$app
->
log
(
"Found
$tmp_num_records
changes, starting update process."
,
LOGLEVEL_DEBUG
);
//** Go through the sys_datalog table and call the processing functions
//** Go through the sys_datalog table and call the processing functions
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment