diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/exe/indexer.php | 2 | ||||
| -rw-r--r-- | lib/exe/media.php | 2 | ||||
| -rw-r--r-- | lib/plugins/config/lang/en/lang.php | 7 | ||||
| -rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 49b532507..19eea767f 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -49,7 +49,7 @@ function runIndexer(){ // try to aquire a lock $lock = $conf['lockdir'].'/_indexer.lock'; - while(!@mkdir($lock,0777)){ + while(!@mkdir($lock,$conf['dmode'])){ usleep(50); if(time()-@filemtime($lock) > 60*5){ // looks like a stale lock - remove it diff --git a/lib/exe/media.php b/lib/exe/media.php index cddf258db..47af3c4d3 100644 --- a/lib/exe/media.php +++ b/lib/exe/media.php @@ -129,7 +129,7 @@ function media_upload($NS,$AUTH){ io_makeFileDir($fn); if(move_uploaded_file($file['tmp_name'], $fn)) { // set the correct permission here - chmod($fn, 0777 - $conf['umask']); + chmod($fn, $conf['fmode'] & ~$conf['umask']); msg($lang['uploadsucc'],1); return true; }else{ diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index c79c09381..d404277bc 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -18,9 +18,10 @@ $lang['locked'] = 'The settings file can not be updated, if this is unintent ensure the local settings file name and permissions are correct.'; // settings prompts -$lang['umask'] = 'new file permission mask'; //set the umask for new files -$lang['dmask'] = 'new folder permission mask'; //directory mask accordingly -$lang['lang'] = 'language'; //your language +$lang['umask'] = 'global permission mask'; //set the umask for new files +$lang['fmode'] = 'file creation mode'; //directory mask accordingly +$lang['dmode'] = 'directory creation mode'; //directory mask accordingly +$lang['lang'] = 'language'; //your language $lang['basedir'] = 'base directory'; //absolute dir from serveroot - blank for autodetection $lang['baseurl'] = 'base url'; //URL to server including protocol - blank for autodetect $lang['savedir'] = 'save directory'; //where to store all the files diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 70333c28c..010b2d6ae 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -73,7 +73,8 @@ $meta['lang'] = array('dirchoice','_dir' => DOKU_INC.'inc/lang/'); $meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/'); $meta['umask'] = array('numeric','_pattern' => '/0[0-7]{3}/'); // only accept octal representation -$meta['dmask'] = array('numeric','_pattern' => '/0[0-7]{3}/'); // only accept octal representation +$meta['dmode'] = array('numeric','_pattern' => '/0[0-7]{3}/'); // only accept octal representation +$meta['fmode'] = array('numeric','_pattern' => '/0[0-7]{3}/'); // only accept octal representation $meta['basedir'] = array(''); $meta['baseurl'] = array(''); |