maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix limit_extensions setting

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-01-10 15:42:11 +01:00
parent bba872618a
commit 62006d584e
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin_phpsettings.php
View File

@@ -417,7 +417,7 @@ if ($page == 'overview') {
$max_spare_servers = isset($_POST['max_spare_servers']) ? (int) $_POST['max_spare_servers'] : 0; $max_spare_servers = isset($_POST['max_spare_servers']) ? (int) $_POST['max_spare_servers'] : 0;
$max_requests = isset($_POST['max_requests']) ? (int) $_POST['max_requests'] : 0; $max_requests = isset($_POST['max_requests']) ? (int) $_POST['max_requests'] : 0;
$idle_timeout = isset($_POST['idle_timeout']) ? (int) $_POST['idle_timeout'] : 0; $idle_timeout = isset($_POST['idle_timeout']) ? (int) $_POST['idle_timeout'] : 0;
$limit_extensions = validate($_POST['limit_extensions'], 'limit_extensions'); $limit_extensions = validate($_POST['limit_extensions'], 'limit_extensions', '^(\.[a-z]([a-z0-9]+)\ ?)+$');
if (strlen($description) == 0 || strlen($description) > 50) { if (strlen($description) == 0 || strlen($description) > 50) {
standard_error('descriptioninvalid'); standard_error('descriptioninvalid');
@@ -546,7 +546,7 @@ if ($page == 'overview') {
$max_spare_servers = isset($_POST['max_spare_servers']) ? (int) $_POST['max_spare_servers'] : $result['max_spare_servers']; $max_spare_servers = isset($_POST['max_spare_servers']) ? (int) $_POST['max_spare_servers'] : $result['max_spare_servers'];
$max_requests = isset($_POST['max_requests']) ? (int) $_POST['max_requests'] : $result['max_requests']; $max_requests = isset($_POST['max_requests']) ? (int) $_POST['max_requests'] : $result['max_requests'];
$idle_timeout = isset($_POST['idle_timeout']) ? (int) $_POST['idle_timeout'] : $result['idle_timeout']; $idle_timeout = isset($_POST['idle_timeout']) ? (int) $_POST['idle_timeout'] : $result['idle_timeout'];
$limit_extensions = validate($_POST['limit_extensions'], 'limit_extensions'); $limit_extensions = validate($_POST['limit_extensions'], 'limit_extensions', '^(\.[a-z]([a-z0-9]+)\ ?)+$');
if (strlen($description) == 0 || strlen($description) > 50) { if (strlen($description) == 0 || strlen($description) > 50) {
standard_error('descriptioninvalid'); standard_error('descriptioninvalid');

5
lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php
View File

@@ -85,10 +85,7 @@ return array(
'limit_extensions' => array( 'limit_extensions' => array(
'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'], 'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'],
'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'], 'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'],
'type' => 'string', 'type' => 'text',
'string_delimiter' => ' ',
'string_regexp' => '^\.[a-z]([a-z0-9]+)',
'string_emptyallowed' => false,
'value' => '.php' 'value' => '.php'
) )
) )

5
lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php
View File

@@ -86,10 +86,7 @@ return array(
'limit_extensions' => array( 'limit_extensions' => array(
'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'], 'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'],
'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'], 'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'],
'type' => 'string', 'type' => 'text',
'string_delimiter' => ' ',
'string_regexp' => '^\.[a-z]([a-z0-9]+)',
'string_emptyallowed' => false,
'value' => $result['limit_extensions'] 'value' => $result['limit_extensions']
) )
) )