]> source.dussan.org Git - nextcloud-server.git/commitdiff
Style: Different line endings in one file are bad for sure
authorFelix Moeller <mail@felixmoeller.de>
Sun, 4 Nov 2012 18:11:53 +0000 (19:11 +0100)
committerFelix Moeller <mail@felixmoeller.de>
Sun, 4 Nov 2012 18:11:53 +0000 (19:11 +0100)
I think Checkstyle did not find this occurence, however consistant line endings are preferred.
@DeepDiver can Checkstyle find this?

lib/filesystem.php

index e4c0e2e1eb5e6a57a8c507631f5ae728180387e3..4635f8b4f305eaf629ee5c0aec68164230f9fa2e 100644 (file)
@@ -209,48 +209,48 @@ class OC_Filesystem{
        }
 
        static private function loadSystemMountPoints($user) {
-               if(is_file(OC::$SERVERROOT.'/config/mount.php')) {\r
-                       $mountConfig=include OC::$SERVERROOT.'/config/mount.php';\r
-                       if(isset($mountConfig['global'])) {\r
-                               foreach($mountConfig['global'] as $mountPoint=>$options) {\r
-                                       self::mount($options['class'], $options['options'], $mountPoint);\r
-                               }\r
-                       }\r
-               \r
-                       if(isset($mountConfig['group'])) {\r
-                               foreach($mountConfig['group'] as $group=>$mounts) {\r
-                                       if(OC_Group::inGroup($user, $group)) {\r
-                                               foreach($mounts as $mountPoint=>$options) {\r
-                                                       $mountPoint=self::setUserVars($mountPoint, $user);\r
-                                                       foreach($options as &$option) {\r
-                                                               $option=self::setUserVars($option, $user);\r
-                                                       }\r
-                                                       self::mount($options['class'], $options['options'], $mountPoint);\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               \r
-                       if(isset($mountConfig['user'])) {\r
-                               foreach($mountConfig['user'] as $user=>$mounts) {\r
-                                       if($user==='all' or strtolower($user)===strtolower($user)) {\r
-                                               foreach($mounts as $mountPoint=>$options) {\r
-                                                       $mountPoint=self::setUserVars($mountPoint, $user);\r
-                                                       foreach($options as &$option) {\r
-                                                               $option=self::setUserVars($option, $user);\r
-                                                       }\r
-                                                       self::mount($options['class'], $options['options'], $mountPoint);\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               \r
-                       $mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');\r
-                       $previousMTime=OC_Appconfig::getValue('files', 'mountconfigmtime', 0);\r
-                       if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated\r
-                               OC_FileCache::triggerUpdate();\r
-                               OC_Appconfig::setValue('files', 'mountconfigmtime', $mtime);\r
-                       }\r
+               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);
+                       }
                }               
        }