WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not copy .gitignore

This commit is contained in:
Roland Gruber 2016-04-22 22:09:14 +02:00
parent fa1713323f
commit 0b3c6b1036
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lam/lib/upgrade.inc
View File

@ -4,7 +4,7 @@ $Id:
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2012 Christian Kropp Copyright (C) 2012 Christian Kropp
2012 Roland Gruber 2012 - 2016 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -49,7 +49,7 @@ function testPermissions() {
/** /**
* Recursively checks the permissions in a directory. * Recursively checks the permissions in a directory.
* *
* @param String $dir directory * @param String $dir directory
* @return array list of files/directories with wrong permission * @return array list of files/directories with wrong permission
*/ */
@ -74,13 +74,13 @@ function testPermissionRecursive($dir) {
} }
} }
@closedir($dirHandle); @closedir($dirHandle);
return $result; return $result;
} }
/** /**
* Checks if the given directory contains files. * Checks if the given directory contains files.
* This is used to check if config files need to be migrated. * This is used to check if config files need to be migrated.
* *
* @param String $dir directory path * @param String $dir directory path
*/ */
function containsFiles($dir) { function containsFiles($dir) {
@ -97,7 +97,7 @@ function containsFiles($dir) {
} }
} }
@closedir($dirHandle); @closedir($dirHandle);
return $return; return $return;
} }
@ -175,7 +175,7 @@ function recursiveCopy($src, $dst, $profiles, $fileFilter = null, $overwrite = t
} }
elseif ((isset($fileFilter) && (strpos($file, $fileFilter) === 0 || $file == '.htaccess')) elseif ((isset($fileFilter) && (strpos($file, $fileFilter) === 0 || $file == '.htaccess'))
|| (!isset($fileFilter))) { || (!isset($fileFilter))) {
if (!is_file($src . '/' . $file)) { if (!is_file($src . '/' . $file) || ($file == '.gitignore')) {
continue; continue;
} }
if ($overwrite || !file_exists($dst . '/' . $file)) { if ($overwrite || !file_exists($dst . '/' . $file)) {