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

update ftp_groups table in case webserver-/fcgid-/fpm-user changes, refs #1491 (i guess)

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-02-16 14:56:08 +01:00
parent 1d319e001c
commit fae58078f8
4 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/admin/settings/130.webserver.php
View File

@@ -49,7 +49,7 @@ return array(
'varname' => 'httpuser', 'varname' => 'httpuser',
'type' => 'string', 'type' => 'string',
'default' => 'www-data', 'default' => 'www-data',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingWebserverFcgidFpmUser',
), ),
'system_httpgroup' => array( 'system_httpgroup' => array(
'label' => $lng['admin']['webserver_group'], 'label' => $lng['admin']['webserver_group'],

2
actions/admin/settings/135.fcgid.php
View File

@@ -112,7 +112,7 @@ return array(
'varname' => 'mod_fcgid_httpuser', 'varname' => 'mod_fcgid_httpuser',
'type' => 'string', 'type' => 'string',
'default' => 'froxlorlocal', 'default' => 'froxlorlocal',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingWebserverFcgidFpmUser',
'websrv_avail' => array('apache2') 'websrv_avail' => array('apache2')
), ),
'system_mod_fcgid_httpgroup' => array( 'system_mod_fcgid_httpgroup' => array(

2
actions/admin/settings/136.phpfpm.php
View File

@@ -44,7 +44,7 @@ return array(
'varname' => 'vhost_httpuser', 'varname' => 'vhost_httpuser',
'type' => 'string', 'type' => 'string',
'default' => 'froxlorlocal', 'default' => 'froxlorlocal',
'save_method' => 'storeSettingField' 'save_method' => 'storeSettingWebserverFcgidFpmUser'
), ),
'system_phpfpm_httpgroup' => array( 'system_phpfpm_httpgroup' => array(
'label' => $lng['phpfpm']['vhost_httpgroup'], 'label' => $lng['phpfpm']['vhost_httpgroup'],

58
lib/functions/settings/function.storeSettingWebserverFcgidFpmUser.php Normal file
View File

@@ -0,0 +1,58 @@
<?php
/**
* This file is part of the Froxlor project.
* Copyright (c) 2015 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Functions
*
* @since 0.9.34
*/
/**
* Whenever the webserver- / FCGID- or FPM-user gets updated
* we need to update ftp_groups accordingly
*/
function storeSettingWebserverFcgidFpmUser($fieldname, $fielddata, $newfieldvalue)
{
if (is_array($fielddata) && isset($fielddata['settinggroup']) && isset($fielddata['varname'])) {
$update_user = null;
// webserver
if ($fielddata['settinggroup'] == 'system' && $fielddata['varname'] == 'httpuser') {
$update_user = Settings::Get('system.httpuser');
}
// fcgid
if ($fielddata['settinggroup'] == 'system' && $fielddata['varname'] == 'mod_fcgid_httpuser') {
$update_user = Settings::Get('system.mod_fcgid_httpuser');
}
// webserver
if ($fielddata['settinggroup'] == 'phpfpm' && $fielddata['varname'] == 'vhost_httpuser') {
$update_user = Settings::Get('phpfpm.vhost_httpuser');
}
$returnvalue = storeSettingField($fieldname, $fielddata, $newfieldvalue);
if ($returnvalue !== false) {
/**
* only update if anything changed
*/
if ($update_user != null && $newfieldvalue != $update_user) {
$upd_stmt = Database::prepare("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members` = REPLACE(`members`, :olduser, :newuser)");
Database::pexecute($upd_stmt, array('olduser' => $update_user, 'newuser' => $newfieldvalue));
}
}
}
return $returnvalue;
}