tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2845 from Icinga/fix/translation-excludes 

GetTextTranslationHelper: Make sure we ignore any dotfile or vendor dir
This commit is contained in:
lippserd 2017-11-08 09:53:54 +01:00 committed by GitHub
parent 1a86c61c2d 389b23af81
commit cc4fcaefad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/translation/library/Translation/Util/GettextTranslationHelper.php
View File

@ -467,10 +467,13 @@ class GettextTranslationHelper
$subdirs = array(); $subdirs = array();
while (($filename = readdir($directoryHandle)) !== false) { while (($filename = readdir($directoryHandle)) !== false) {
if ($filename[0] === '.' || $filename === 'vendor') {
continue;
}
$filepath = $directory . DIRECTORY_SEPARATOR . $filename; $filepath = $directory . DIRECTORY_SEPARATOR . $filename;
if (preg_match('@^[^\.].+\.(' . implode('|', $this->sourceExtensions) . ')$@', $filename)) { if (preg_match('@^[^\.].+\.(' . implode('|', $this->sourceExtensions) . ')$@', $filename)) {
$file->fwrite($filepath . PHP_EOL); $file->fwrite($filepath . PHP_EOL);
} elseif (is_dir($filepath) && !preg_match('@^(\.|\.\.)$@', $filename)) { } elseif (! is_link($filepath) && is_dir($filepath)) {
$subdirs[] = $filepath; $subdirs[] = $filepath;
} }
} }