Skip to content
GitLab
About GitLab
GitLab: the DevOps platform
Explore GitLab
Install GitLab
How GitLab compares
Get started
GitLab docs
GitLab Learn
Pricing
Talk to an expert
/
Help
What's new
2
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Projects
Groups
Snippets
Register
Sign in
Toggle navigation
Menu
Open sidebar
Tiki Wiki CMS Groupware
Tiki
Commits
182729ed
Commit
182729ed
authored
Dec 06, 2022
by
Jonny Bradley
Browse files
[FIX] Allocate more time for the secdb security check (via a new allocate pref)
parent
f6283be0
Changes
3
Hide whitespace changes
Inline
Side-by-side
lib/prefs/allocate.php
View file @
182729ed
...
...
@@ -32,6 +32,15 @@ function prefs_allocate_list()
'tracker_import_items'
=>
[
'label'
=>
tr
(
'Tracker item import'
),
'memory'
=>
true
,
'time'
=>
true
],
'tracker_clear_items'
=>
[
'label'
=>
tr
(
'Tracker clear'
),
'memory'
=>
false
,
'time'
=>
true
],
'print_pdf'
=>
[
'label'
=>
tr
(
'Printing to PDF'
),
'memory'
=>
true
,
'time'
=>
true
],
'secdb_check'
=>
[
'label'
=>
tr
(
'Security check'
),
'memory'
=>
false
,
'time'
=>
true
,
'extras_time'
=>
[
'default'
=>
60
,
'shorthint'
=>
tr
(
'time allocated to check all tiki files on tiki-admin_security.php'
),
],
],
'php_execution'
=>
[
'label'
=>
tr
(
'PHP execution'
),
'memory'
=>
true
,
...
...
@@ -72,6 +81,7 @@ function prefs_allocate_list()
'help'
=>
'Time-Limit'
,
'type'
=>
'text'
,
'default'
=>
''
,
'shorthint'
=>
tr
(
'for example: 30'
),
'units'
=>
tr
(
'seconds'
),
'size'
=>
8
,
];
...
...
templates/admin/include_performance.tpl
View file @
182729ed
...
...
@@ -220,8 +220,9 @@
{
preference
name
=
allocate_time_tracker_clear_items
}
{
preference
name
=
allocate_memory_print_pdf
}
{
preference
name
=
allocate_time_print_pdf
}
{
preference
name
=
"allocate_memory_unified_rebuild"
}
{
preference
name
=
"allocate_time_unified_rebuild"
}
{
preference
name
=
'allocate_memory_unified_rebuild'
}
{
preference
name
=
'allocate_time_unified_rebuild'
}
{
preference
name
=
'allocate_time_secdb_check'
}
{/
tab
}
{/
tabset
}
...
...
tiki-admin_security.php
View file @
182729ed
...
...
@@ -322,7 +322,14 @@ if (isset($_POST['check_files'])) {
$svn_diff
=
[];
}
md5_check_dir
(
"."
,
$result
,
$svn_diff
);
$result
=
TikiLib
::
lib
(
'tiki'
)
->
allocate_extra
(
'secdb_check'
,
function
()
use
(
$result
,
$svn_diff
)
{
md5_check_dir
(
"."
,
$result
,
$svn_diff
);
return
$result
;
}
);
$smarty
->
assign
(
'filecheck'
,
true
);
$smarty
->
assign_by_ref
(
'tikifiles'
,
$result
);
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment