nextcloud / server

apps/files_sharing/lib/share/file.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 	 */
 	public function generateTarget($filePath, $shareWith, $exclude = null) {
 		$shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
-		$target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
+		$target = \OC\Files\Filesystem::normalizePath($shareFolder.'/'.basename($filePath));
 
 		// for group shares we return the target right away
 		if ($shareWith === false) {
@@ -104,13 +104,13 @@ 
 		}
 
 		\OC\Files\Filesystem::initMountPoints($shareWith);
-		$view = new \OC\Files\View('/' . $shareWith . '/files');
+		$view = new \OC\Files\View('/'.$shareWith.'/files');
 
 		if (!$view->is_dir($shareFolder)) {
 			$dir = '';
 			$subdirs = explode('/', $shareFolder);
 			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
+				$dir = $dir.'/'.$subdir;
 				if (!$view->is_dir($dir)) {
 					$view->mkdir($dir);
 				}
@@ -237,7 +237,7 @@ 
 		if ($share['item_type'] === 'folder' && $target !== '') {
 			// note: in case of ext storage mount points the path might be empty
 			// which would cause a leading slash to appear
-			$share['path'] = ltrim($share['path'] . '/' . $target, '/');
+			$share['path'] = ltrim($share['path'].'/'.$target, '/');
 		}
 		return self::resolveReshares($share);
 	}

Indentation +192 added lines, -192 removed lines

@@ -31,196 +31,196 @@
 
 class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 
-	const FORMAT_SHARED_STORAGE = 0;
-	const FORMAT_GET_FOLDER_CONTENTS = 1;
-	const FORMAT_FILE_APP_ROOT = 2;
-	const FORMAT_OPENDIR = 3;
-	const FORMAT_GET_ALL = 4;
-	const FORMAT_PERMISSIONS = 5;
-	const FORMAT_TARGET_NAMES = 6;
-
-	private $path;
-
-	public function isValidSource($itemSource, $uidOwner) {
-		try {
-			$path = \OC\Files\Filesystem::getPath($itemSource);
-			// FIXME: attributes should not be set here,
-			// keeping this pattern for now to avoid unexpected
-			// regressions
-			$this->path = \OC\Files\Filesystem::normalizePath(basename($path));
-			return true;
-		} catch (\OCP\Files\NotFoundException $e) {
-			return false;
-		}
-	}
-
-	public function getFilePath($itemSource, $uidOwner) {
-		if (isset($this->path)) {
-			$path = $this->path;
-			$this->path = null;
-			return $path;
-		} else {
-			try {
-				$path = \OC\Files\Filesystem::getPath($itemSource);
-				return $path;
-			} catch (\OCP\Files\NotFoundException $e) {
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * create unique target
-	 * @param string $filePath
-	 * @param string $shareWith
-	 * @param array $exclude (optional)
-	 * @return string
-	 */
-	public function generateTarget($filePath, $shareWith, $exclude = null) {
-		$shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
-		$target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
-
-		// for group shares we return the target right away
-		if ($shareWith === false) {
-			return $target;
-		}
-
-		\OC\Files\Filesystem::initMountPoints($shareWith);
-		$view = new \OC\Files\View('/' . $shareWith . '/files');
-
-		if (!$view->is_dir($shareFolder)) {
-			$dir = '';
-			$subdirs = explode('/', $shareFolder);
-			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
-				if (!$view->is_dir($dir)) {
-					$view->mkdir($dir);
-				}
-			}
-		}
-
-		$excludeList = (is_array($exclude)) ? $exclude : array();
-
-		return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
-	}
-
-	public function formatItems($items, $format, $parameters = null) {
-		if ($format == self::FORMAT_SHARED_STORAGE) {
-			// Only 1 item should come through for this format call
-			$item = array_shift($items);
-			return array(
-				'parent' => $item['parent'],
-				'path' => $item['path'],
-				'storage' => $item['storage'],
-				'permissions' => $item['permissions'],
-				'uid_owner' => $item['uid_owner'],
-			);
-		} else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) {
-			$files = array();
-			foreach ($items as $item) {
-				$file = array();
-				$file['fileid'] = $item['file_source'];
-				$file['storage'] = $item['storage'];
-				$file['path'] = $item['file_target'];
-				$file['parent'] = $item['file_parent'];
-				$file['name'] = basename($item['file_target']);
-				$file['mimetype'] = $item['mimetype'];
-				$file['mimepart'] = $item['mimepart'];
-				$file['mtime'] = $item['mtime'];
-				$file['encrypted'] = $item['encrypted'];
-				$file['etag'] = $item['etag'];
-				$file['uid_owner'] = $item['uid_owner'];
-				$file['displayname_owner'] = $item['displayname_owner'];
-
-				$storage = \OC\Files\Filesystem::getStorage('/');
-				$cache = $storage->getCache();
-				$file['size'] = $item['size'];
-				$files[] = $file;
-			}
-			return $files;
-		} else if ($format == self::FORMAT_OPENDIR) {
-			$files = array();
-			foreach ($items as $item) {
-				$files[] = basename($item['file_target']);
-			}
-			return $files;
-		} else if ($format == self::FORMAT_GET_ALL) {
-			$ids = array();
-			foreach ($items as $item) {
-				$ids[] = $item['file_source'];
-			}
-			return $ids;
-		} else if ($format === self::FORMAT_PERMISSIONS) {
-			$filePermissions = array();
-			foreach ($items as $item) {
-				$filePermissions[$item['file_source']] = $item['permissions'];
-			}
-			return $filePermissions;
-		} else if ($format === self::FORMAT_TARGET_NAMES) {
-			$targets = array();
-			foreach ($items as $item) {
-				$targets[] = $item['file_target'];
-			}
-			return $targets;
-		}
-		return array();
-	}
-
-	/**
-	 * check if server2server share is enabled
-	 *
-	 * @param int $shareType
-	 * @return boolean
-	 */
-	public function isShareTypeAllowed($shareType) {
-		if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
-			return \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled();
-		}
-
-		return true;
-	}
-
-	/**
-	 * resolve reshares to return the correct source item
-	 * @param array $source
-	 * @return array source item
-	 */
-	protected static function resolveReshares($source) {
-		if (isset($source['parent'])) {
-			$parent = $source['parent'];
-			while (isset($parent)) {
-				$query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
-				$item = $query->execute(array($parent))->fetchRow();
-				if (isset($item['parent'])) {
-					$parent = $item['parent'];
-				} else {
-					$fileOwner = $item['uid_owner'];
-					break;
-				}
-			}
-		} else {
-			$fileOwner = $source['uid_owner'];
-		}
-		if (isset($fileOwner)) {
-			$source['fileOwner'] = $fileOwner;
-		} else {
-			\OCP\Util::writeLog('files_sharing', "No owner found for reshare", \OCP\Util::ERROR);
-		}
-
-		return $source;
-	}
-
-	/**
-	 * @param string $target
-	 * @param array $share
-	 * @return array|false source item
-	 */
-	public static function getSource($target, $share) {
-		if ($share['item_type'] === 'folder' && $target !== '') {
-			// note: in case of ext storage mount points the path might be empty
-			// which would cause a leading slash to appear
-			$share['path'] = ltrim($share['path'] . '/' . $target, '/');
-		}
-		return self::resolveReshares($share);
-	}
+    const FORMAT_SHARED_STORAGE = 0;
+    const FORMAT_GET_FOLDER_CONTENTS = 1;
+    const FORMAT_FILE_APP_ROOT = 2;
+    const FORMAT_OPENDIR = 3;
+    const FORMAT_GET_ALL = 4;
+    const FORMAT_PERMISSIONS = 5;
+    const FORMAT_TARGET_NAMES = 6;
+
+    private $path;
+
+    public function isValidSource($itemSource, $uidOwner) {
+        try {
+            $path = \OC\Files\Filesystem::getPath($itemSource);
+            // FIXME: attributes should not be set here,
+            // keeping this pattern for now to avoid unexpected
+            // regressions
+            $this->path = \OC\Files\Filesystem::normalizePath(basename($path));
+            return true;
+        } catch (\OCP\Files\NotFoundException $e) {
+            return false;
+        }
+    }
+
+    public function getFilePath($itemSource, $uidOwner) {
+        if (isset($this->path)) {
+            $path = $this->path;
+            $this->path = null;
+            return $path;
+        } else {
+            try {
+                $path = \OC\Files\Filesystem::getPath($itemSource);
+                return $path;
+            } catch (\OCP\Files\NotFoundException $e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * create unique target
+     * @param string $filePath
+     * @param string $shareWith
+     * @param array $exclude (optional)
+     * @return string
+     */
+    public function generateTarget($filePath, $shareWith, $exclude = null) {
+        $shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
+        $target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
+
+        // for group shares we return the target right away
+        if ($shareWith === false) {
+            return $target;
+        }
+
+        \OC\Files\Filesystem::initMountPoints($shareWith);
+        $view = new \OC\Files\View('/' . $shareWith . '/files');
+
+        if (!$view->is_dir($shareFolder)) {
+            $dir = '';
+            $subdirs = explode('/', $shareFolder);
+            foreach ($subdirs as $subdir) {
+                $dir = $dir . '/' . $subdir;
+                if (!$view->is_dir($dir)) {
+                    $view->mkdir($dir);
+                }
+            }
+        }
+
+        $excludeList = (is_array($exclude)) ? $exclude : array();
+
+        return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
+    }
+
+    public function formatItems($items, $format, $parameters = null) {
+        if ($format == self::FORMAT_SHARED_STORAGE) {
+            // Only 1 item should come through for this format call
+            $item = array_shift($items);
+            return array(
+                'parent' => $item['parent'],
+                'path' => $item['path'],
+                'storage' => $item['storage'],
+                'permissions' => $item['permissions'],
+                'uid_owner' => $item['uid_owner'],
+            );
+        } else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) {
+            $files = array();
+            foreach ($items as $item) {
+                $file = array();
+                $file['fileid'] = $item['file_source'];
+                $file['storage'] = $item['storage'];
+                $file['path'] = $item['file_target'];
+                $file['parent'] = $item['file_parent'];
+                $file['name'] = basename($item['file_target']);
+                $file['mimetype'] = $item['mimetype'];
+                $file['mimepart'] = $item['mimepart'];
+                $file['mtime'] = $item['mtime'];
+                $file['encrypted'] = $item['encrypted'];
+                $file['etag'] = $item['etag'];
+                $file['uid_owner'] = $item['uid_owner'];
+                $file['displayname_owner'] = $item['displayname_owner'];
+
+                $storage = \OC\Files\Filesystem::getStorage('/');
+                $cache = $storage->getCache();
+                $file['size'] = $item['size'];
+                $files[] = $file;
+            }
+            return $files;
+        } else if ($format == self::FORMAT_OPENDIR) {
+            $files = array();
+            foreach ($items as $item) {
+                $files[] = basename($item['file_target']);
+            }
+            return $files;
+        } else if ($format == self::FORMAT_GET_ALL) {
+            $ids = array();
+            foreach ($items as $item) {
+                $ids[] = $item['file_source'];
+            }
+            return $ids;
+        } else if ($format === self::FORMAT_PERMISSIONS) {
+            $filePermissions = array();
+            foreach ($items as $item) {
+                $filePermissions[$item['file_source']] = $item['permissions'];
+            }
+            return $filePermissions;
+        } else if ($format === self::FORMAT_TARGET_NAMES) {
+            $targets = array();
+            foreach ($items as $item) {
+                $targets[] = $item['file_target'];
+            }
+            return $targets;
+        }
+        return array();
+    }
+
+    /**
+     * check if server2server share is enabled
+     *
+     * @param int $shareType
+     * @return boolean
+     */
+    public function isShareTypeAllowed($shareType) {
+        if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
+            return \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled();
+        }
+
+        return true;
+    }
+
+    /**
+     * resolve reshares to return the correct source item
+     * @param array $source
+     * @return array source item
+     */
+    protected static function resolveReshares($source) {
+        if (isset($source['parent'])) {
+            $parent = $source['parent'];
+            while (isset($parent)) {
+                $query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+                $item = $query->execute(array($parent))->fetchRow();
+                if (isset($item['parent'])) {
+                    $parent = $item['parent'];
+                } else {
+                    $fileOwner = $item['uid_owner'];
+                    break;
+                }
+            }
+        } else {
+            $fileOwner = $source['uid_owner'];
+        }
+        if (isset($fileOwner)) {
+            $source['fileOwner'] = $fileOwner;
+        } else {
+            \OCP\Util::writeLog('files_sharing', "No owner found for reshare", \OCP\Util::ERROR);
+        }
+
+        return $source;
+    }
+
+    /**
+     * @param string $target
+     * @param array $share
+     * @return array|false source item
+     */
+    public static function getSource($target, $share) {
+        if ($share['item_type'] === 'folder' && $target !== '') {
+            // note: in case of ext storage mount points the path might be empty
+            // which would cause a leading slash to appear
+            $share['path'] = ltrim($share['path'] . '/' . $target, '/');
+        }
+        return self::resolveReshares($share);
+    }
 }

apps/files_sharing/appinfo/routes.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 /** @var $this \OCP\Route\IRouter */
 $this->create('core_ajax_public_preview', '/publicpreview')->action(
 	function() {
-		require_once __DIR__ . '/../ajax/publicpreview.php';
+		require_once __DIR__.'/../ajax/publicpreview.php';
 	});
 
 $this->create('files_sharing_ajax_list', 'ajax/list.php')

Indentation +61 added lines, -61 removed lines

@@ -31,32 +31,32 @@ 
 
 $application = new Application();
 $application->registerRoutes($this, [
-	'resources' => [
-		'ExternalShares' => ['url' => '/api/externalShares'],
-	],
-	'routes' => [
-		[
-			'name' => 'externalShares#testRemote',
-			'url' => '/testremote',
-			'verb' => 'GET'
-		],
-	],
+    'resources' => [
+        'ExternalShares' => ['url' => '/api/externalShares'],
+    ],
+    'routes' => [
+        [
+            'name' => 'externalShares#testRemote',
+            'url' => '/testremote',
+            'verb' => 'GET'
+        ],
+    ],
 ]);
 
 /** @var $this \OCP\Route\IRouter */
 $this->create('core_ajax_public_preview', '/publicpreview')->action(
-	function() {
-		require_once __DIR__ . '/../ajax/publicpreview.php';
-	});
+    function() {
+        require_once __DIR__ . '/../ajax/publicpreview.php';
+    });
 
 $this->create('files_sharing_ajax_list', 'ajax/list.php')
-	->actionInclude('files_sharing/ajax/list.php');
+    ->actionInclude('files_sharing/ajax/list.php');
 $this->create('files_sharing_ajax_publicpreview', 'ajax/publicpreview.php')
-	->actionInclude('files_sharing/ajax/publicpreview.php');
+    ->actionInclude('files_sharing/ajax/publicpreview.php');
 $this->create('sharing_external_shareinfo', '/shareinfo')
-	->actionInclude('files_sharing/ajax/shareinfo.php');
+    ->actionInclude('files_sharing/ajax/shareinfo.php');
 $this->create('sharing_external_add', '/external')
-	->actionInclude('files_sharing/ajax/external.php');
+    ->actionInclude('files_sharing/ajax/external.php');
 
 // OCS API
 
@@ -65,73 +65,73 @@ 
 $OCSShare = new \OCA\Files_Sharing\API\OCSShareWrapper();
 
 API::register('get',
-		'/apps/files_sharing/api/v1/shares',
-		[$OCSShare, 'getAllShares'],
-		'files_sharing');
+        '/apps/files_sharing/api/v1/shares',
+        [$OCSShare, 'getAllShares'],
+        'files_sharing');
 
 API::register('post',
-		'/apps/files_sharing/api/v1/shares',
-		[$OCSShare, 'createShare'],
-		'files_sharing');
+        '/apps/files_sharing/api/v1/shares',
+        [$OCSShare, 'createShare'],
+        'files_sharing');
 
 API::register('get',
-		'/apps/files_sharing/api/v1/shares/{id}',
-		[$OCSShare, 'getShare'],
-		'files_sharing');
+        '/apps/files_sharing/api/v1/shares/{id}',
+        [$OCSShare, 'getShare'],
+        'files_sharing');
 
 API::register('put',
-		'/apps/files_sharing/api/v1/shares/{id}',
-		[$OCSShare, 'updateShare'],
-		'files_sharing');
+        '/apps/files_sharing/api/v1/shares/{id}',
+        [$OCSShare, 'updateShare'],
+        'files_sharing');
 
 API::register('delete',
-		'/apps/files_sharing/api/v1/shares/{id}',
-		[$OCSShare, 'deleteShare'],
-		'files_sharing');
+        '/apps/files_sharing/api/v1/shares/{id}',
+        [$OCSShare, 'deleteShare'],
+        'files_sharing');
 
 API::register('get',
-		'/apps/files_sharing/api/v1/remote_shares',
-		array('\OCA\Files_Sharing\API\Remote', 'getShares'),
-		'files_sharing');
+        '/apps/files_sharing/api/v1/remote_shares',
+        array('\OCA\Files_Sharing\API\Remote', 'getShares'),
+        'files_sharing');
 
 API::register('get',
-		'/apps/files_sharing/api/v1/remote_shares/pending',
-		array('\OCA\Files_Sharing\API\Remote', 'getOpenShares'),
-		'files_sharing');
+        '/apps/files_sharing/api/v1/remote_shares/pending',
+        array('\OCA\Files_Sharing\API\Remote', 'getOpenShares'),
+        'files_sharing');
 
 API::register('post',
-		'/apps/files_sharing/api/v1/remote_shares/pending/{id}',
-		array('\OCA\Files_Sharing\API\Remote', 'acceptShare'),
-		'files_sharing');
+        '/apps/files_sharing/api/v1/remote_shares/pending/{id}',
+        array('\OCA\Files_Sharing\API\Remote', 'acceptShare'),
+        'files_sharing');
 
 API::register('delete',
-		'/apps/files_sharing/api/v1/remote_shares/pending/{id}',
-		array('\OCA\Files_Sharing\API\Remote', 'declineShare'),
-		'files_sharing');
+        '/apps/files_sharing/api/v1/remote_shares/pending/{id}',
+        array('\OCA\Files_Sharing\API\Remote', 'declineShare'),
+        'files_sharing');
 
 API::register('get',
-		'/apps/files_sharing/api/v1/remote_shares/{id}',
-		array('\OCA\Files_Sharing\API\Remote', 'getShare'),
-		'files_sharing');
+        '/apps/files_sharing/api/v1/remote_shares/{id}',
+        array('\OCA\Files_Sharing\API\Remote', 'getShare'),
+        'files_sharing');
 
 API::register('delete',
-		'/apps/files_sharing/api/v1/remote_shares/{id}',
-		array('\OCA\Files_Sharing\API\Remote', 'unshare'),
-		'files_sharing');
+        '/apps/files_sharing/api/v1/remote_shares/{id}',
+        array('\OCA\Files_Sharing\API\Remote', 'unshare'),
+        'files_sharing');
 
 
 $sharees = new \OCA\Files_Sharing\API\Sharees(\OC::$server->getGroupManager(),
-                                              \OC::$server->getUserManager(),
-                                              \OC::$server->getContactsManager(),
-                                              \OC::$server->getConfig(),
-                                              \OC::$server->getUserSession(),
-                                              \OC::$server->getURLGenerator(),
-                                              \OC::$server->getRequest(),
-                                              \OC::$server->getLogger(),
-                                              \OC::$server->getShareManager());
+                                                \OC::$server->getUserManager(),
+                                                \OC::$server->getContactsManager(),
+                                                \OC::$server->getConfig(),
+                                                \OC::$server->getUserSession(),
+                                                \OC::$server->getURLGenerator(),
+                                                \OC::$server->getRequest(),
+                                                \OC::$server->getLogger(),
+                                                \OC::$server->getShareManager());
 
 API::register('get',
-		'/apps/files_sharing/api/v1/sharees',
-		[$sharees, 'search'],
-		'files_sharing', API::USER_AUTH);
+        '/apps/files_sharing/api/v1/sharees',
+        [$sharees, 'search'],
+        'files_sharing', API::USER_AUTH);
 

apps/dav/templates/exception.php

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
-	/** @var array $_ */
-	/** @var OC_L10N $l */
+    /** @var array $_ */
+    /** @var OC_L10N $l */
 
 style('core', ['styles', 'header']);
 ?>

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 	<ul>
 		<li><?php p($l->t('Remote Address: %s', $_['remoteAddr'])) ?></li>
 		<li><?php p($l->t('Request ID: %s', $_['requestID'])) ?></li>
-		<?php if($_['debugMode']): ?>
+		<?php if ($_['debugMode']): ?>
 			<li><?php p($l->t('Type: %s', $_['errorClass'])) ?></li>
 			<li><?php p($l->t('Code: %s', $_['errorCode'])) ?></li>
 			<li><?php p($l->t('Message: %s', $_['errorMsg'])) ?></li>
@@ -24,7 +24,7 @@ 
 		<?php endif; ?>
 	</ul>
 
-	<?php if($_['debugMode']): ?>
+	<?php if ($_['debugMode']): ?>
 		<br />
 		<h2><strong><?php p($l->t('Trace')) ?></strong></h2>
 		<pre><?php p($_['trace']) ?></pre>

apps/dav/appinfo/app.php

Indentation +14 added lines, -14 removed lines

@@ -29,27 +29,27 @@
 $app->registerHooks();
 
 \OC::$server->registerService('CardDAVSyncService', function() use ($app) {
-	return $app->getSyncService();
+    return $app->getSyncService();
 });
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 
 $eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-	function(GenericEvent $event) use ($app) {
-		/** @var \OCA\DAV\CardDAV\CardDavBackend $cardDavBackend */
-		$cardDavBackend = $app->getContainer()->query('CardDavBackend');
-		$addressBookUri = $event->getSubject();
-		$addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
-		if (!is_null($addressBook)) {
-			$cardDavBackend->deleteAddressBook($addressBook['id']);
-		}
-	}
+    function(GenericEvent $event) use ($app) {
+        /** @var \OCA\DAV\CardDAV\CardDavBackend $cardDavBackend */
+        $cardDavBackend = $app->getContainer()->query('CardDavBackend');
+        $addressBookUri = $event->getSubject();
+        $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
+        if (!is_null($addressBook)) {
+            $cardDavBackend->deleteAddressBook($addressBook['id']);
+        }
+    }
 );
 
 $cm = \OC::$server->getContactsManager();
 $cm->register(function() use ($cm, $app) {
-	$user = \OC::$server->getUserSession()->getUser();
-	if (!is_null($user)) {
-		$app->setupContactsProvider($cm, $user->getUID());
-	}
+    $user = \OC::$server->getUserSession()->getUser();
+    if (!is_null($user)) {
+        $app->setupContactsProvider($cm, $user->getUID());
+    }
 });

apps/user_ldap/appinfo/routes.php

Indentation +7 added lines, -7 removed lines

@@ -23,16 +23,16 @@
 
 /** @var $this \OCP\Route\IRouter */
 $this->create('user_ldap_ajax_clearMappings', 'ajax/clearMappings.php')
-	->actionInclude('user_ldap/ajax/clearMappings.php');
+    ->actionInclude('user_ldap/ajax/clearMappings.php');
 $this->create('user_ldap_ajax_deleteConfiguration', 'ajax/deleteConfiguration.php')
-	->actionInclude('user_ldap/ajax/deleteConfiguration.php');
+    ->actionInclude('user_ldap/ajax/deleteConfiguration.php');
 $this->create('user_ldap_ajax_getConfiguration', 'ajax/getConfiguration.php')
-	->actionInclude('user_ldap/ajax/getConfiguration.php');
+    ->actionInclude('user_ldap/ajax/getConfiguration.php');
 $this->create('user_ldap_ajax_getNewServerConfigPrefix', 'ajax/getNewServerConfigPrefix.php')
-	->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
+    ->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
 $this->create('user_ldap_ajax_setConfiguration', 'ajax/setConfiguration.php')
-	->actionInclude('user_ldap/ajax/setConfiguration.php');
+    ->actionInclude('user_ldap/ajax/setConfiguration.php');
 $this->create('user_ldap_ajax_testConfiguration', 'ajax/testConfiguration.php')
-	->actionInclude('user_ldap/ajax/testConfiguration.php');
+    ->actionInclude('user_ldap/ajax/testConfiguration.php');
 $this->create('user_ldap_ajax_wizard', 'ajax/wizard.php')
-	->actionInclude('user_ldap/ajax/wizard.php');
+    ->actionInclude('user_ldap/ajax/wizard.php');

apps/federation/appinfo/routes.php

Indentation +20 added lines, -20 removed lines

@@ -23,26 +23,26 @@
 $application = new \OCA\Federation\AppInfo\Application();
 
 $application->registerRoutes(
-	$this,
-	[
-		'routes' => [
-			[
-				'name' => 'Settings#addServer',
-				'url' => '/trusted-servers',
-				'verb' => 'POST'
-			],
-			[
-				'name' => 'Settings#removeServer',
-				'url' => '/trusted-servers/{id}',
-				'verb' => 'DELETE'
-			],
-			[
-				'name' => 'Settings#autoAddServers',
-				'url' => '/auto-add-servers',
-				'verb' => 'POST'
-			],
-		]
-	]
+    $this,
+    [
+        'routes' => [
+            [
+                'name' => 'Settings#addServer',
+                'url' => '/trusted-servers',
+                'verb' => 'POST'
+            ],
+            [
+                'name' => 'Settings#removeServer',
+                'url' => '/trusted-servers/{id}',
+                'verb' => 'DELETE'
+            ],
+            [
+                'name' => 'Settings#autoAddServers',
+                'url' => '/auto-add-servers',
+                'verb' => 'POST'
+            ],
+        ]
+    ]
 );
 
 $application->registerOCSApi();

apps/admin_audit/lib/actions/trashbin.php

Indentation +11 added lines, -11 removed lines

@@ -30,16 +30,16 @@
 
 class Trashbin extends Action {
 
-	public function delete($params) {
-		$this->log('File "%s" deleted from trash bin.',
-			['path' => $params['path']], ['path']
-		);
-	}
-
-	public function restore($params) {
-		$this->log('File "%s" restored from trash bin.',
-			['path' => $params['filePath']], ['path']
-		);
-	}
+    public function delete($params) {
+        $this->log('File "%s" deleted from trash bin.',
+            ['path' => $params['path']], ['path']
+        );
+    }
+
+    public function restore($params) {
+        $this->log('File "%s" restored from trash bin.',
+            ['path' => $params['filePath']], ['path']
+        );
+    }
 
 }

apps/files/ajax/upload.php

Spacing +16 added lines, -16 removed lines

@@ -50,14 +50,14 @@ 
 if (empty($_POST['dirToken'])) {
 	// The standard case, files are uploaded through logged in users :)
 	OCP\JSON::checkLoggedIn();
-	$dir = isset($_POST['dir']) ? (string)$_POST['dir'] : '';
+	$dir = isset($_POST['dir']) ? (string) $_POST['dir'] : '';
 	if (!$dir || empty($dir) || $dir === false) {
 		OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
 		die();
 	}
 } else {
 	$shareManager = \OC::$server->getShareManager();
-	$share = $shareManager->getShareByToken((string)$_POST['dirToken']);
+	$share = $shareManager->getShareByToken((string) $_POST['dirToken']);
 
 	// TODO: ideally this code should be in files_sharing/ajax/upload.php
 	// and the upload/file transfer code needs to be refactored into a utility method
@@ -68,12 +68,12 @@ 
 	// If it is a write-only folder no subdirectory can be specified
 	$publicDirectory = '';
 	if ($share->getPermissions() & \OCP\Constants::PERMISSION_READ) {
-		$publicDirectory = !empty($_POST['subdir']) ? (string)$_POST['subdir'] : '/';
+		$publicDirectory = !empty($_POST['subdir']) ? (string) $_POST['subdir'] : '/';
 	} else {
 		$_POST['file_directory'] = '';
 	}
 
-	$linkItem = OCP\Share::getShareByToken((string)$_POST['dirToken']);
+	$linkItem = OCP\Share::getShareByToken((string) $_POST['dirToken']);
 	if ($linkItem === false) {
 		OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token')))));
 		die();
@@ -92,7 +92,7 @@ 
 
 		// The token defines the target directory (security reasons)
 		$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
-		if($path === null) {
+		if ($path === null) {
 			OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
 			die();
 		}
@@ -172,7 +172,7 @@ 
 			$resolution = null;
 		}
 
-		if(isset($_POST['dirToken'])) {
+		if (isset($_POST['dirToken'])) {
 			// If it is a read only share the resolution will always be autorename
 			if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
 				$resolution = 'autorename';
@@ -181,25 +181,25 @@ 
 
 		// target directory for when uploading folders
 		$relativePath = '';
-		if(!empty($_POST['file_directory'])) {
+		if (!empty($_POST['file_directory'])) {
 			$relativePath = '/'.$_POST['file_directory'];
 		}
 
 		// $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
 		if ($resolution === 'autorename') {
 			// append a number in brackets like 'filename (2).ext'
-			$target = OCP\Files::buildNotExistingFileName($dir . $relativePath, $files['name'][$i]);
+			$target = OCP\Files::buildNotExistingFileName($dir.$relativePath, $files['name'][$i]);
 		} else {
-			$target = \OC\Files\Filesystem::normalizePath($dir . $relativePath.'/'.$files['name'][$i]);
+			$target = \OC\Files\Filesystem::normalizePath($dir.$relativePath.'/'.$files['name'][$i]);
 		}
 
 		// relative dir to return to the client
 		if (isset($publicDirectory)) {
 			// path relative to the public root
-			$returnedDir = $publicDirectory . $relativePath;
+			$returnedDir = $publicDirectory.$relativePath;
 		} else {
 			// full path
-			$returnedDir = $dir . $relativePath;
+			$returnedDir = $dir.$relativePath;
 		}
 		$returnedDir = \OC\Files\Filesystem::normalizePath($returnedDir);
 
@@ -208,7 +208,7 @@ 
 		if ($exists) {
 			$updatable = \OC\Files\Filesystem::isUpdatable($target);
 		}
-		if ( ! $exists || ($updatable && $resolution === 'replace' ) ) {
+		if (!$exists || ($updatable && $resolution === 'replace')) {
 			// upload and overwrite file
 			try
 			{
@@ -236,7 +236,7 @@ 
 					$error = $l->t('Upload failed. Could not find uploaded file');
 					$errorFileName = $files['name'][$i];
 				}
-			} catch(Exception $ex) {
+			} catch (Exception $ex) {
 				$error = $ex->getMessage();
 			}
 
@@ -267,12 +267,12 @@ 
 
 if ($error === false) {
 	// Do not leak file information if it is a read-only share
-	if(isset($_POST['dirToken'])) {
+	if (isset($_POST['dirToken'])) {
 		$shareManager = \OC::$server->getShareManager();
-		$share = $shareManager->getShareByToken((string)$_POST['dirToken']);
+		$share = $shareManager->getShareByToken((string) $_POST['dirToken']);
 		if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
 			$newResults = [];
-			foreach($result as $singleResult) {
+			foreach ($result as $singleResult) {
 				$fileName = $singleResult['originalname'];
 				$newResults['filename'] = $fileName;
 				$newResults['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($fileName);

Indentation +205 added lines, -205 removed lines

@@ -48,67 +48,67 @@ 
 
 $l = \OC::$server->getL10N('files');
 if (empty($_POST['dirToken'])) {
-	// The standard case, files are uploaded through logged in users :)
-	OCP\JSON::checkLoggedIn();
-	$dir = isset($_POST['dir']) ? (string)$_POST['dir'] : '';
-	if (!$dir || empty($dir) || $dir === false) {
-		OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
-		die();
-	}
+    // The standard case, files are uploaded through logged in users :)
+    OCP\JSON::checkLoggedIn();
+    $dir = isset($_POST['dir']) ? (string)$_POST['dir'] : '';
+    if (!$dir || empty($dir) || $dir === false) {
+        OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
+        die();
+    }
 } else {
-	$shareManager = \OC::$server->getShareManager();
-	$share = $shareManager->getShareByToken((string)$_POST['dirToken']);
-
-	// TODO: ideally this code should be in files_sharing/ajax/upload.php
-	// and the upload/file transfer code needs to be refactored into a utility method
-	// that could be used there
-
-	\OC_User::setIncognitoMode(true);
-
-	// If it is a write-only folder no subdirectory can be specified
-	$publicDirectory = '';
-	if ($share->getPermissions() & \OCP\Constants::PERMISSION_READ) {
-		$publicDirectory = !empty($_POST['subdir']) ? (string)$_POST['subdir'] : '/';
-	} else {
-		$_POST['file_directory'] = '';
-	}
-
-	$linkItem = OCP\Share::getShareByToken((string)$_POST['dirToken']);
-	if ($linkItem === false) {
-		OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token')))));
-		die();
-	}
-
-	if (!($linkItem['permissions'] & \OCP\Constants::PERMISSION_CREATE)) {
-		OCP\JSON::checkLoggedIn();
-	} else {
-		// resolve reshares
-		$rootLinkItem = OCP\Share::resolveReShare($linkItem);
-
-		OCP\JSON::checkUserExists($rootLinkItem['uid_owner']);
-		// Setup FS with owner
-		OC_Util::tearDownFS();
-		OC_Util::setupFS($rootLinkItem['uid_owner']);
-
-		// The token defines the target directory (security reasons)
-		$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
-		if($path === null) {
-			OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
-			die();
-		}
-		$dir = sprintf(
-			"/%s/%s",
-			$path,
-			$publicDirectory
-		);
-
-		if (!$dir || empty($dir) || $dir === false) {
-			OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
-			die();
-		}
-
-		$dir = rtrim($dir, '/');
-	}
+    $shareManager = \OC::$server->getShareManager();
+    $share = $shareManager->getShareByToken((string)$_POST['dirToken']);
+
+    // TODO: ideally this code should be in files_sharing/ajax/upload.php
+    // and the upload/file transfer code needs to be refactored into a utility method
+    // that could be used there
+
+    \OC_User::setIncognitoMode(true);
+
+    // If it is a write-only folder no subdirectory can be specified
+    $publicDirectory = '';
+    if ($share->getPermissions() & \OCP\Constants::PERMISSION_READ) {
+        $publicDirectory = !empty($_POST['subdir']) ? (string)$_POST['subdir'] : '/';
+    } else {
+        $_POST['file_directory'] = '';
+    }
+
+    $linkItem = OCP\Share::getShareByToken((string)$_POST['dirToken']);
+    if ($linkItem === false) {
+        OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Invalid Token')))));
+        die();
+    }
+
+    if (!($linkItem['permissions'] & \OCP\Constants::PERMISSION_CREATE)) {
+        OCP\JSON::checkLoggedIn();
+    } else {
+        // resolve reshares
+        $rootLinkItem = OCP\Share::resolveReShare($linkItem);
+
+        OCP\JSON::checkUserExists($rootLinkItem['uid_owner']);
+        // Setup FS with owner
+        OC_Util::tearDownFS();
+        OC_Util::setupFS($rootLinkItem['uid_owner']);
+
+        // The token defines the target directory (security reasons)
+        $path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
+        if($path === null) {
+            OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
+            die();
+        }
+        $dir = sprintf(
+            "/%s/%s",
+            $path,
+            $publicDirectory
+        );
+
+        if (!$dir || empty($dir) || $dir === false) {
+            OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
+            die();
+        }
+
+        $dir = rtrim($dir, '/');
+    }
 }
 
 OCP\JSON::callCheck();
@@ -117,27 +117,27 @@ 
 $storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
 
 if (!isset($_FILES['files'])) {
-	OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('No file was uploaded. Unknown error')), $storageStats)));
-	exit();
+    OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('No file was uploaded. Unknown error')), $storageStats)));
+    exit();
 }
 
 foreach ($_FILES['files']['error'] as $error) {
-	if ($error != 0) {
-		$errors = array(
-			UPLOAD_ERR_OK => $l->t('There is no error, the file uploaded with success'),
-			UPLOAD_ERR_INI_SIZE => $l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini: ')
-			. OC::$server->getIniWrapper()->getNumeric('upload_max_filesize'),
-			UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
-			UPLOAD_ERR_PARTIAL => $l->t('The uploaded file was only partially uploaded'),
-			UPLOAD_ERR_NO_FILE => $l->t('No file was uploaded'),
-			UPLOAD_ERR_NO_TMP_DIR => $l->t('Missing a temporary folder'),
-			UPLOAD_ERR_CANT_WRITE => $l->t('Failed to write to disk'),
-		);
-		$errorMessage = $errors[$error];
-		\OC::$server->getLogger()->alert("Upload error: $error - $errorMessage", array('app' => 'files'));
-		OCP\JSON::error(array('data' => array_merge(array('message' => $errorMessage), $storageStats)));
-		exit();
-	}
+    if ($error != 0) {
+        $errors = array(
+            UPLOAD_ERR_OK => $l->t('There is no error, the file uploaded with success'),
+            UPLOAD_ERR_INI_SIZE => $l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini: ')
+            . OC::$server->getIniWrapper()->getNumeric('upload_max_filesize'),
+            UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
+            UPLOAD_ERR_PARTIAL => $l->t('The uploaded file was only partially uploaded'),
+            UPLOAD_ERR_NO_FILE => $l->t('No file was uploaded'),
+            UPLOAD_ERR_NO_TMP_DIR => $l->t('Missing a temporary folder'),
+            UPLOAD_ERR_CANT_WRITE => $l->t('Failed to write to disk'),
+        );
+        $errorMessage = $errors[$error];
+        \OC::$server->getLogger()->alert("Upload error: $error - $errorMessage", array('app' => 'files'));
+        OCP\JSON::error(array('data' => array_merge(array('message' => $errorMessage), $storageStats)));
+        exit();
+    }
 }
 $files = $_FILES['files'];
 
@@ -150,142 +150,142 @@ 
 $isReceivedShare = \OC::$server->getRequest()->getParam('isReceivedShare', false) === 'true';
 // defer quota check for received shares
 if (!$isReceivedShare && $storageStats['freeSpace'] >= 0) {
-	foreach ($files['size'] as $size) {
-		$totalSize += $size;
-	}
+    foreach ($files['size'] as $size) {
+        $totalSize += $size;
+    }
 }
 if ($maxUploadFileSize >= 0 and $totalSize > $maxUploadFileSize) {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Not enough storage available'),
-		'uploadMaxFilesize' => $maxUploadFileSize,
-		'maxHumanFilesize' => $maxHumanFileSize)));
-	exit();
+    OCP\JSON::error(array('data' => array('message' => $l->t('Not enough storage available'),
+        'uploadMaxFilesize' => $maxUploadFileSize,
+        'maxHumanFilesize' => $maxHumanFileSize)));
+    exit();
 }
 
 $result = array();
 if (\OC\Files\Filesystem::isValidPath($dir) === true) {
-	$fileCount = count($files['name']);
-	for ($i = 0; $i < $fileCount; $i++) {
-
-		if (isset($_POST['resolution'])) {
-			$resolution = $_POST['resolution'];
-		} else {
-			$resolution = null;
-		}
-
-		if(isset($_POST['dirToken'])) {
-			// If it is a read only share the resolution will always be autorename
-			if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
-				$resolution = 'autorename';
-			}
-		}
-
-		// target directory for when uploading folders
-		$relativePath = '';
-		if(!empty($_POST['file_directory'])) {
-			$relativePath = '/'.$_POST['file_directory'];
-		}
-
-		// $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
-		if ($resolution === 'autorename') {
-			// append a number in brackets like 'filename (2).ext'
-			$target = OCP\Files::buildNotExistingFileName($dir . $relativePath, $files['name'][$i]);
-		} else {
-			$target = \OC\Files\Filesystem::normalizePath($dir . $relativePath.'/'.$files['name'][$i]);
-		}
-
-		// relative dir to return to the client
-		if (isset($publicDirectory)) {
-			// path relative to the public root
-			$returnedDir = $publicDirectory . $relativePath;
-		} else {
-			// full path
-			$returnedDir = $dir . $relativePath;
-		}
-		$returnedDir = \OC\Files\Filesystem::normalizePath($returnedDir);
-
-
-		$exists = \OC\Files\Filesystem::file_exists($target);
-		if ($exists) {
-			$updatable = \OC\Files\Filesystem::isUpdatable($target);
-		}
-		if ( ! $exists || ($updatable && $resolution === 'replace' ) ) {
-			// upload and overwrite file
-			try
-			{
-				if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
-
-					// updated max file size after upload
-					$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
-
-					$meta = \OC\Files\Filesystem::getFileInfo($target);
-					if ($meta === false) {
-						$error = $l->t('The target folder has been moved or deleted.');
-						$errorCode = 'targetnotfound';
-					} else {
-						$data = \OCA\Files\Helper::formatFileInfo($meta);
-						$data['status'] = 'success';
-						$data['originalname'] = $files['name'][$i];
-						$data['uploadMaxFilesize'] = $maxUploadFileSize;
-						$data['maxHumanFilesize'] = $maxHumanFileSize;
-						$data['permissions'] = $meta['permissions'];
-						$data['directory'] = $returnedDir;
-						$result[] = $data;
-					}
-
-				} else {
-					$error = $l->t('Upload failed. Could not find uploaded file');
-					$errorFileName = $files['name'][$i];
-				}
-			} catch(Exception $ex) {
-				$error = $ex->getMessage();
-			}
-
-		} else {
-			// file already exists
-			$meta = \OC\Files\Filesystem::getFileInfo($target);
-			if ($meta === false) {
-				$error = $l->t('Upload failed. Could not get file info.');
-			} else {
-				$data = \OCA\Files\Helper::formatFileInfo($meta);
-				if ($updatable) {
-					$data['status'] = 'existserror';
-				} else {
-					$data['status'] = 'readonly';
-				}
-				$data['originalname'] = $files['name'][$i];
-				$data['uploadMaxFilesize'] = $maxUploadFileSize;
-				$data['maxHumanFilesize'] = $maxHumanFileSize;
-				$data['permissions'] = $meta['permissions'];
-				$data['directory'] = $returnedDir;
-				$result[] = $data;
-			}
-		}
-	}
+    $fileCount = count($files['name']);
+    for ($i = 0; $i < $fileCount; $i++) {
+
+        if (isset($_POST['resolution'])) {
+            $resolution = $_POST['resolution'];
+        } else {
+            $resolution = null;
+        }
+
+        if(isset($_POST['dirToken'])) {
+            // If it is a read only share the resolution will always be autorename
+            if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+                $resolution = 'autorename';
+            }
+        }
+
+        // target directory for when uploading folders
+        $relativePath = '';
+        if(!empty($_POST['file_directory'])) {
+            $relativePath = '/'.$_POST['file_directory'];
+        }
+
+        // $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
+        if ($resolution === 'autorename') {
+            // append a number in brackets like 'filename (2).ext'
+            $target = OCP\Files::buildNotExistingFileName($dir . $relativePath, $files['name'][$i]);
+        } else {
+            $target = \OC\Files\Filesystem::normalizePath($dir . $relativePath.'/'.$files['name'][$i]);
+        }
+
+        // relative dir to return to the client
+        if (isset($publicDirectory)) {
+            // path relative to the public root
+            $returnedDir = $publicDirectory . $relativePath;
+        } else {
+            // full path
+            $returnedDir = $dir . $relativePath;
+        }
+        $returnedDir = \OC\Files\Filesystem::normalizePath($returnedDir);
+
+
+        $exists = \OC\Files\Filesystem::file_exists($target);
+        if ($exists) {
+            $updatable = \OC\Files\Filesystem::isUpdatable($target);
+        }
+        if ( ! $exists || ($updatable && $resolution === 'replace' ) ) {
+            // upload and overwrite file
+            try
+            {
+                if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
+
+                    // updated max file size after upload
+                    $storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
+
+                    $meta = \OC\Files\Filesystem::getFileInfo($target);
+                    if ($meta === false) {
+                        $error = $l->t('The target folder has been moved or deleted.');
+                        $errorCode = 'targetnotfound';
+                    } else {
+                        $data = \OCA\Files\Helper::formatFileInfo($meta);
+                        $data['status'] = 'success';
+                        $data['originalname'] = $files['name'][$i];
+                        $data['uploadMaxFilesize'] = $maxUploadFileSize;
+                        $data['maxHumanFilesize'] = $maxHumanFileSize;
+                        $data['permissions'] = $meta['permissions'];
+                        $data['directory'] = $returnedDir;
+                        $result[] = $data;
+                    }
+
+                } else {
+                    $error = $l->t('Upload failed. Could not find uploaded file');
+                    $errorFileName = $files['name'][$i];
+                }
+            } catch(Exception $ex) {
+                $error = $ex->getMessage();
+            }
+
+        } else {
+            // file already exists
+            $meta = \OC\Files\Filesystem::getFileInfo($target);
+            if ($meta === false) {
+                $error = $l->t('Upload failed. Could not get file info.');
+            } else {
+                $data = \OCA\Files\Helper::formatFileInfo($meta);
+                if ($updatable) {
+                    $data['status'] = 'existserror';
+                } else {
+                    $data['status'] = 'readonly';
+                }
+                $data['originalname'] = $files['name'][$i];
+                $data['uploadMaxFilesize'] = $maxUploadFileSize;
+                $data['maxHumanFilesize'] = $maxHumanFileSize;
+                $data['permissions'] = $meta['permissions'];
+                $data['directory'] = $returnedDir;
+                $result[] = $data;
+            }
+        }
+    }
 } else {
-	$error = $l->t('Invalid directory.');
+    $error = $l->t('Invalid directory.');
 }
 
 if ($error === false) {
-	// Do not leak file information if it is a read-only share
-	if(isset($_POST['dirToken'])) {
-		$shareManager = \OC::$server->getShareManager();
-		$share = $shareManager->getShareByToken((string)$_POST['dirToken']);
-		if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
-			$newResults = [];
-			foreach($result as $singleResult) {
-				$fileName = $singleResult['originalname'];
-				$newResults['filename'] = $fileName;
-				$newResults['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($fileName);
-			}
-			$result = $newResults;
-		}
-	}
-
-	OCP\JSON::encodedPrint($result);
+    // Do not leak file information if it is a read-only share
+    if(isset($_POST['dirToken'])) {
+        $shareManager = \OC::$server->getShareManager();
+        $share = $shareManager->getShareByToken((string)$_POST['dirToken']);
+        if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+            $newResults = [];
+            foreach($result as $singleResult) {
+                $fileName = $singleResult['originalname'];
+                $newResults['filename'] = $fileName;
+                $newResults['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($fileName);
+            }
+            $result = $newResults;
+        }
+    }
+
+    OCP\JSON::encodedPrint($result);
 } else {
-	OCP\JSON::error(array(array('data' => array_merge(array(
-		'message' => $error,
-		'code' => $errorCode,
-		'filename' => $errorFileName
-	), $storageStats))));
+    OCP\JSON::error(array(array('data' => array_merge(array(
+        'message' => $error,
+        'code' => $errorCode,
+        'filename' => $errorFileName
+    ), $storageStats))));
 }

apps/files/list.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 $config = \OC::$server->getConfig();
 // TODO: move this to the generated config.js
 $publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
-$uploadLimit=OCP\Util::uploadLimit();
+$uploadLimit = OCP\Util::uploadLimit();
 
 // renders the controls and table headers template
 $tmpl = new OCP\Template('files', 'list', '');