diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-30 11:50:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-30 11:50:23 +0000 |
| commit | 764c1c4f2b8602c1536da78eb5d9c4a9fbd6d55f (patch) | |
| tree | 57d38e3d456ab5031bc92a503ba86caec5b8723e /phpBB/includes/functions.php | |
| parent | 0d92e30b38763e6c58b017cbae1cbdc21cc8aedc (diff) | |
| download | forums-764c1c4f2b8602c1536da78eb5d9c4a9fbd6d55f.tar forums-764c1c4f2b8602c1536da78eb5d9c4a9fbd6d55f.tar.gz forums-764c1c4f2b8602c1536da78eb5d9c4a9fbd6d55f.tar.bz2 forums-764c1c4f2b8602c1536da78eb5d9c4a9fbd6d55f.tar.xz forums-764c1c4f2b8602c1536da78eb5d9c4a9fbd6d55f.zip | |
Let's face it - the most common setup we see with phpBB is having group-specific settings for external users (FTP, whatever).
Changed phpbb_chmod() to set the group bit, even if the PHP user is the owner. (somehow this sounds complicated, i hope you get the idea).
git-svn-id: file:///svn/phpbb/trunk@9132 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 906eea2981..7023fae9da 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -867,7 +867,7 @@ function _hash_crypt_private($password, $setting, &$itoa64) /** * Global function for chmodding directories and files for internal use * This function determines owner and group whom the file belongs to and user and group of PHP and then set safest possible file permissions. -* The function determines owner and group from common.php file and sets the same to the provided file. +* The function determines owner and group from common.php file and sets the same to the provided file. Permissions are mapped to the group, user always has rw(x) permission. * The function uses bit fields to build the permissions. * The function sets the appropiate execute bit on directories. * @@ -935,7 +935,7 @@ function phpbb_chmod($filename, $perms = CHMOD_READ) // Who is PHP? if ($file_uid === false || $file_gid === false || $php_uid === false || $php_gids === false) { - $php = null; + $php = NULL; } else if ($file_uid == $php_uid /* && $common_php_owner !== false && $common_php_owner === $file_uid*/) { @@ -967,12 +967,15 @@ function phpbb_chmod($filename, $perms = CHMOD_READ) { case null: case 'owner': + /* ATTENTION: if php is owner or NULL we set it to group here. This is the most failsafe combination for the vast majority of server setups. + $result = @chmod($filename, ($owner << 6) + (0 << 3) + (0 << 0)); if (!is_null($php) || (is_readable($filename) && is_writable($filename))) { break; } + */ case 'group': $result = @chmod($filename, ($owner << 6) + ($perms << 3) + (0 << 0)); |