зеркало из https://github.com/nextcloud/server.git
Style: Different line endings in one file are bad for sure
I think Checkstyle did not find this occurence, however consistant line endings are preferred. @DeepDiver can Checkstyle find this?
This commit is contained in:
Родитель
9795bc19bf
Коммит
1e33ad9cbc
|
@ -209,48 +209,48 @@ class OC_Filesystem{
|
|||
}
|
||||
|
||||
static private function loadSystemMountPoints($user) {
|
||||
if(is_file(OC::$SERVERROOT.'/config/mount.php')) {
|
||||
$mountConfig=include OC::$SERVERROOT.'/config/mount.php';
|
||||
if(isset($mountConfig['global'])) {
|
||||
foreach($mountConfig['global'] as $mountPoint=>$options) {
|
||||
self::mount($options['class'], $options['options'], $mountPoint);
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($mountConfig['group'])) {
|
||||
foreach($mountConfig['group'] as $group=>$mounts) {
|
||||
if(OC_Group::inGroup($user, $group)) {
|
||||
foreach($mounts as $mountPoint=>$options) {
|
||||
$mountPoint=self::setUserVars($mountPoint, $user);
|
||||
foreach($options as &$option) {
|
||||
$option=self::setUserVars($option, $user);
|
||||
}
|
||||
self::mount($options['class'], $options['options'], $mountPoint);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($mountConfig['user'])) {
|
||||
foreach($mountConfig['user'] as $user=>$mounts) {
|
||||
if($user==='all' or strtolower($user)===strtolower($user)) {
|
||||
foreach($mounts as $mountPoint=>$options) {
|
||||
$mountPoint=self::setUserVars($mountPoint, $user);
|
||||
foreach($options as &$option) {
|
||||
$option=self::setUserVars($option, $user);
|
||||
}
|
||||
self::mount($options['class'], $options['options'], $mountPoint);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');
|
||||
$previousMTime=OC_Appconfig::getValue('files', 'mountconfigmtime', 0);
|
||||
if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
|
||||
OC_FileCache::triggerUpdate();
|
||||
OC_Appconfig::setValue('files', 'mountconfigmtime', $mtime);
|
||||
}
|
||||
if(is_file(OC::$SERVERROOT.'/config/mount.php')) {
|
||||
$mountConfig=include OC::$SERVERROOT.'/config/mount.php';
|
||||
if(isset($mountConfig['global'])) {
|
||||
foreach($mountConfig['global'] as $mountPoint=>$options) {
|
||||
self::mount($options['class'], $options['options'], $mountPoint);
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($mountConfig['group'])) {
|
||||
foreach($mountConfig['group'] as $group=>$mounts) {
|
||||
if(OC_Group::inGroup($user, $group)) {
|
||||
foreach($mounts as $mountPoint=>$options) {
|
||||
$mountPoint=self::setUserVars($mountPoint, $user);
|
||||
foreach($options as &$option) {
|
||||
$option=self::setUserVars($option, $user);
|
||||
}
|
||||
self::mount($options['class'], $options['options'], $mountPoint);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($mountConfig['user'])) {
|
||||
foreach($mountConfig['user'] as $user=>$mounts) {
|
||||
if($user==='all' or strtolower($user)===strtolower($user)) {
|
||||
foreach($mounts as $mountPoint=>$options) {
|
||||
$mountPoint=self::setUserVars($mountPoint, $user);
|
||||
foreach($options as &$option) {
|
||||
$option=self::setUserVars($option, $user);
|
||||
}
|
||||
self::mount($options['class'], $options['options'], $mountPoint);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');
|
||||
$previousMTime=OC_Appconfig::getValue('files', 'mountconfigmtime', 0);
|
||||
if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
|
||||
OC_FileCache::triggerUpdate();
|
||||
OC_Appconfig::setValue('files', 'mountconfigmtime', $mtime);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче