From 2c44aa674248910d92681fb49b4f43688625b768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 30 Apr 2015 16:20:24 +0200
Subject: [PATCH] Add sensible default mode to directory creation
Fix #2632
---
htdocs/core/lib/functions.lib.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ca1fff9a923..417c9284f68 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3727,10 +3727,10 @@ function get_exdir($num,$level=3,$alpha=0,$withoutslash=0)
*
* @param string $dir Directory to create (Separator must be '/'. Example: '/mydir/mysubdir')
* @param string $dataroot Data root directory (To avoid having the data root in the loop. Using this will also lost the warning on first dir PHP has no permission when open_basedir is used)
- * @param int $newmask Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0444'
+ * @param int $newmask Mask for new file (Defaults to $conf->global->MAIN_UMASK or 0755 if unavailable). Example: '0444'
* @return int < 0 if KO, 0 = already exists, > 0 if OK
*/
-function dol_mkdir($dir, $dataroot='', $newmask=0)
+function dol_mkdir($dir, $dataroot='', $newmask=null)
{
global $conf;
@@ -3768,7 +3768,9 @@ function dol_mkdir($dir, $dataroot='', $newmask=0)
umask(0);
$dirmaskdec=octdec($newmask);
- if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK);
+ if (empty($newmask)) {
+ $dirmaskdec = empty( $conf->global->MAIN_UMASK ) ? octdec( '0755' ) : octdec( $conf->global->MAIN_UMASK );
+ }
$dirmaskdec |= octdec('0111'); // Set x bit required for directories
if (! @mkdir($ccdir_osencoded, $dirmaskdec))
{
--
GitLab