Skip to content
Extraits de code Groupes Projets
Valider e6af7a2c rédigé par robocoder's avatar robocoder
Parcourir les fichiers

refs #1507 - override umask only on public folders

git-svn-id: http://dev.piwik.org/svn/trunk@2669 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent 32c5043d
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -290,6 +290,10 @@ class Piwik ...@@ -290,6 +290,10 @@ class Piwik
*/ */
static public function checkDirectoriesWritable($directoriesToCheck = null) static public function checkDirectoriesWritable($directoriesToCheck = null)
{ {
static $publicFolders = array(
'/tmp/assets/',
);
if( $directoriesToCheck == null ) if( $directoriesToCheck == null )
{ {
$directoriesToCheck = array( $directoriesToCheck = array(
...@@ -305,6 +309,7 @@ class Piwik ...@@ -305,6 +309,7 @@ class Piwik
$resultCheck = array(); $resultCheck = array();
foreach($directoriesToCheck as $directoryToCheck) foreach($directoriesToCheck as $directoryToCheck)
{ {
$overrideUmask = in_array($directoryToCheck, $publicFolders);
if( !preg_match('/^'.preg_quote(PIWIK_USER_PATH, '/').'/', $directoryToCheck) ) if( !preg_match('/^'.preg_quote(PIWIK_USER_PATH, '/').'/', $directoryToCheck) )
{ {
$directoryToCheck = PIWIK_USER_PATH . $directoryToCheck; $directoryToCheck = PIWIK_USER_PATH . $directoryToCheck;
...@@ -312,7 +317,14 @@ class Piwik ...@@ -312,7 +317,14 @@ class Piwik
if(!file_exists($directoryToCheck)) if(!file_exists($directoryToCheck))
{ {
// the mode in mkdir is modified by the current umask
Piwik_Common::mkdir($directoryToCheck, 0755, false); Piwik_Common::mkdir($directoryToCheck, 0755, false);
// override an overly restrictive umask for public folders only
if($overrideUmask)
{
@chmod($directoryToCheck, 0755);
}
} }
$directory = Piwik_Common::realpath($directoryToCheck); $directory = Piwik_Common::realpath($directoryToCheck);
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter