diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-05-09 17:40:59 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-05-10 09:14:26 +0200 |
| commit | b022ccb86371e774b63a8000f7ea2207c2da225e (patch) | |
| tree | ebef3e2b3fa0b1abe3c807b3c659ca7c3174dc69 /lib | |
| parent | e77ba0280a0ebceef348750f5ff9738012e2b8fb (diff) | |
| download | nextcloud-server-b022ccb86371e774b63a8000f7ea2207c2da225e.tar.gz nextcloud-server-b022ccb86371e774b63a8000f7ea2207c2da225e.zip | |
Whitespace fixes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/files.php | 4 | ||||
| -rw-r--r-- | lib/util.php | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/files.php b/lib/files.php index 5d4d73630eb..d837bf7aa2c 100644 --- a/lib/files.php +++ b/lib/files.php @@ -32,11 +32,11 @@ class OC_Files { * get the content of a directory * @param dir $directory */ - public static function getDirectoryContent($directory, $mimetype_filter = ''){ + public static function getDirectoryContent($directory, $mimetype_filter = ''){ if(strpos($directory,OC::$CONFIG_DATADIRECTORY)===0){ $directory=substr($directory,strlen(OC::$CONFIG_DATADIRECTORY)); } - $files=OC_FileCache::getFolderContent($directory, '', $mimetype_filter); + $files=OC_FileCache::getFolderContent($directory, '', $mimetype_filter); foreach($files as &$file){ $file['directory']=$directory; $file['type']=($file['mimetype']=='httpd/unix-directory')?'dir':'file'; diff --git a/lib/util.php b/lib/util.php index e4546d6ac3d..ff117998713 100644 --- a/lib/util.php +++ b/lib/util.php @@ -31,7 +31,7 @@ class OC_Util { // Create root dir. if(!is_dir($CONFIG_DATADIRECTORY_ROOT)){ $success=@mkdir($CONFIG_DATADIRECTORY_ROOT); - if(!$success) { + if(!$success) { $tmpl = new OC_Template( '', 'error', 'guest' ); $tmpl->assign('errors',array(1=>array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY_ROOT.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' "))); $tmpl->printPage(); @@ -50,7 +50,6 @@ class OC_Util { self::$rootMounted=true; } if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem - OC::$CONFIG_DATADIRECTORY = $CONFIG_DATADIRECTORY_ROOT."/$user/$root"; if( !is_dir( OC::$CONFIG_DATADIRECTORY )){ mkdir( OC::$CONFIG_DATADIRECTORY, 0755, true ); |