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
Package Registry
Model registry
Operate
Environments
Terraform modules
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
Manoa Ratefiarison
ISPConfig 3
Commits
63b9660f
Commit
63b9660f
authored
5 years ago
by
Till Brehm
Browse files
Options
Downloads
Patches
Plain Diff
Fixes #5369 Internal ISPConfig cronjobs are not run in 3.1-dev version
parent
7eb3be87
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
install/sql/incremental/upd_dev_collection.sql
+2
-0
2 additions, 0 deletions
install/sql/incremental/upd_dev_collection.sql
server/lib/classes/cron.inc.php
+2
-2
2 additions, 2 deletions
server/lib/classes/cron.inc.php
with
4 additions
and
2 deletions
install/sql/incremental/upd_dev_collection.sql
+
2
−
0
View file @
63b9660f
...
@@ -35,3 +35,5 @@ ALTER TABLE `ftp_user` CHANGE COLUMN `password` `password` VARCHAR(200) DEFAULT
...
@@ -35,3 +35,5 @@ ALTER TABLE `ftp_user` CHANGE COLUMN `password` `password` VARCHAR(200) DEFAULT
ALTER
TABLE
`shell_user`
CHANGE
COLUMN
`password`
`password`
VARCHAR
(
200
)
DEFAULT
NULL
;
ALTER
TABLE
`shell_user`
CHANGE
COLUMN
`password`
`password`
VARCHAR
(
200
)
DEFAULT
NULL
;
ALTER
TABLE
`sys_user`
CHANGE
COLUMN
`passwort`
`passwort`
VARCHAR
(
200
)
DEFAULT
NULL
;
ALTER
TABLE
`sys_user`
CHANGE
COLUMN
`passwort`
`passwort`
VARCHAR
(
200
)
DEFAULT
NULL
;
ALTER
TABLE
`webdav_user`
CHANGE
COLUMN
`password`
`password`
VARCHAR
(
200
)
DEFAULT
NULL
;
ALTER
TABLE
`webdav_user`
CHANGE
COLUMN
`password`
`password`
VARCHAR
(
200
)
DEFAULT
NULL
;
DELETE
FROM
sys_cron
WHERE
`next_run`
IS
NOT
NULL
AND
`next_run`
>=
DATE_ADD
(
`last_run`
,
INTERVAL
30
DAY
)
AND
`next_run`
BETWEEN
'2020-01-01'
AND
'2020-01-02'
;
This diff is collapsed.
Click to expand it.
server/lib/classes/cron.inc.php
+
2
−
2
View file @
63b9660f
...
@@ -265,8 +265,8 @@ class cron {
...
@@ -265,8 +265,8 @@ class cron {
reset
(
$this
->
_aValidValues
[
$sField
]);
reset
(
$this
->
_aValidValues
[
$sField
]);
foreach
(
$this
->
_aValidValues
[
$sField
]
as
$cur
)
{
foreach
(
$this
->
_aValidValues
[
$sField
]
as
$cur
)
{
if
(
$bIncludeCurrent
==
true
&&
$cur
[
'value'
]
>=
$iValue
)
return
$cur
[
'value'
]
;
if
(
$bIncludeCurrent
==
true
&&
$cur
>=
$iValue
)
return
$cur
;
elseif
(
$cur
[
'value'
]
>
$iValue
)
return
$cur
[
'value'
]
;
elseif
(
$cur
>
$iValue
)
return
$cur
;
}
}
return
reset
(
$this
->
_aValidValues
[
$sField
]);
return
reset
(
$this
->
_aValidValues
[
$sField
]);
}
}
...
...
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