Inspection of "validate file name before uploading in upload only..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#4212)

by Individual IT

created 2017-04-05 07:37 UTC

Status

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -26,10 +26,10 @@
 block discarded – undo
 
 class Application extends App {
 
-	public function __construct (array $urlParams = array()) {
-		parent::__construct('comments', $urlParams);
-		$container = $this->getContainer();
+    public function __construct (array $urlParams = array()) {
+        parent::__construct('comments', $urlParams);
+        $container = $this->getContainer();
 
-		$container->registerAlias('NotificationsController', Notifications::class);
-	}
+        $container->registerAlias('NotificationsController', Notifications::class);
+    }
 }

Please login to merge, or discard this patch.

apps/comments/lib/EventHandler.php 1 patch

Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

@@ -36,56 +36,56 @@
 block discarded – undo
  * @package OCA\Comments
  */
 class EventHandler implements ICommentsEventHandler {
-	/** @var ActivityListener */
-	private $activityListener;
+    /** @var ActivityListener */
+    private $activityListener;
 
-	/** @var NotificationListener */
-	private $notificationListener;
+    /** @var NotificationListener */
+    private $notificationListener;
 
-	public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) {
-		$this->activityListener     = $activityListener;
-		$this->notificationListener = $notificationListener;
-	}
+    public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) {
+        $this->activityListener     = $activityListener;
+        $this->notificationListener = $notificationListener;
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	public function handle(CommentsEvent $event) {
-		if($event->getComment()->getObjectType() !== 'files') {
-			// this is a 'files'-specific Handler
-			return;
-		}
+    /**
+     * @param CommentsEvent $event
+     */
+    public function handle(CommentsEvent $event) {
+        if($event->getComment()->getObjectType() !== 'files') {
+            // this is a 'files'-specific Handler
+            return;
+        }
 
-		$eventType = $event->getEvent();
-		if( $eventType === CommentsEvent::EVENT_ADD
-		) {
-			$this->notificationHandler($event);
-			$this->activityHandler($event);
-			return;
-		}
+        $eventType = $event->getEvent();
+        if( $eventType === CommentsEvent::EVENT_ADD
+        ) {
+            $this->notificationHandler($event);
+            $this->activityHandler($event);
+            return;
+        }
 
-		$applicableEvents = [
-			CommentsEvent::EVENT_PRE_UPDATE,
-			CommentsEvent::EVENT_UPDATE,
-			CommentsEvent::EVENT_DELETE,
-		];
-		if(in_array($eventType, $applicableEvents)) {
-			$this->notificationHandler($event);
-			return;
-		}
-	}
+        $applicableEvents = [
+            CommentsEvent::EVENT_PRE_UPDATE,
+            CommentsEvent::EVENT_UPDATE,
+            CommentsEvent::EVENT_DELETE,
+        ];
+        if(in_array($eventType, $applicableEvents)) {
+            $this->notificationHandler($event);
+            return;
+        }
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	private function activityHandler(CommentsEvent $event) {
-		$this->activityListener->commentEvent($event);
-	}
+    /**
+     * @param CommentsEvent $event
+     */
+    private function activityHandler(CommentsEvent $event) {
+        $this->activityListener->commentEvent($event);
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	private function notificationHandler(CommentsEvent $event) {
-		$this->notificationListener->evaluate($event);
-	}
+    /**
+     * @param CommentsEvent $event
+     */
+    private function notificationHandler(CommentsEvent $event) {
+        $this->notificationListener->evaluate($event);
+    }
 }

Please login to merge, or discard this patch.

apps/comments/appinfo/routes.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -24,5 +24,5 @@
 block discarded – undo
 
 $application = new Application();
 $application->registerRoutes($this, ['routes' => [
-	['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
+    ['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
 ]]);

Please login to merge, or discard this patch.

apps/files_trashbin/ajax/undelete.php 1 patch

Indentation +43 added lines, -43 removed lines patch added patch discarded remove patch

@@ -31,25 +31,25 @@  discard block
 block discarded – undo
 
 $dir = '/';
 if (isset($_POST['dir'])) {
-	$dir = rtrim((string)$_POST['dir'], '/'). '/';
+    $dir = rtrim((string)$_POST['dir'], '/'). '/';
 }
 $allFiles = false;
 if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true') {
-	$allFiles = true;
-	$list = array();
-	$dirListing = true;
-	if ($dir === '' || $dir === '/') {
-		$dirListing = false;
-	}
-	foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
-		$fileName = $file['name'];
-		if (!$dirListing) {
-			$fileName .= '.d' . $file['mtime'];
-		}
-		$list[] = $fileName;
-	}
+    $allFiles = true;
+    $list = array();
+    $dirListing = true;
+    if ($dir === '' || $dir === '/') {
+        $dirListing = false;
+    }
+    foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
+        $fileName = $file['name'];
+        if (!$dirListing) {
+            $fileName .= '.d' . $file['mtime'];
+        }
+        $list[] = $fileName;
+    }
 } else {
-	$list = json_decode($_POST['files']);
+    $list = json_decode($_POST['files']);
 }
 
 $error = array();
@@ -57,38 +57,38 @@  discard block
 block discarded – undo
 
 $i = 0;
 foreach ($list as $file) {
-	$path = $dir . '/' . $file;
-	if ($dir === '/') {
-		$file = ltrim($file, '/');
-		$delimiter = strrpos($file, '.d');
-		$filename = substr($file, 0, $delimiter);
-		$timestamp =  substr($file, $delimiter+2);
-	} else {
-		$path_parts = pathinfo($file);
-		$filename = $path_parts['basename'];
-		$timestamp = null;
-	}
+    $path = $dir . '/' . $file;
+    if ($dir === '/') {
+        $file = ltrim($file, '/');
+        $delimiter = strrpos($file, '.d');
+        $filename = substr($file, 0, $delimiter);
+        $timestamp =  substr($file, $delimiter+2);
+    } else {
+        $path_parts = pathinfo($file);
+        $filename = $path_parts['basename'];
+        $timestamp = null;
+    }
 
-	if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
-		$error[] = $filename;
-		\OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR);
-	} else {
-		$success[$i]['filename'] = $file;
-		$success[$i]['timestamp'] = $timestamp;
-		$i++;
-	}
+    if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
+        $error[] = $filename;
+        \OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR);
+    } else {
+        $success[$i]['filename'] = $file;
+        $success[$i]['timestamp'] = $timestamp;
+        $i++;
+    }
 
 }
 
 if ( $error ) {
-	$filelist = '';
-	foreach ( $error as $e ) {
-		$filelist .= $e.', ';
-	}
-	$l = OC::$server->getL10N('files_trashbin');
-	$message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
-	OCP\JSON::error(array("data" => array("message" => $message,
-										  "success" => $success, "error" => $error)));
+    $filelist = '';
+    foreach ( $error as $e ) {
+        $filelist .= $e.', ';
+    }
+    $l = OC::$server->getL10N('files_trashbin');
+    $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
+    OCP\JSON::error(array("data" => array("message" => $message,
+                                            "success" => $success, "error" => $error)));
 } else {
-	OCP\JSON::success(array("data" => array("success" => $success)));
+    OCP\JSON::success(array("data" => array("success" => $success)));
 }

Please login to merge, or discard this patch.

apps/files_trashbin/ajax/list.php 1 patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -32,10 +32,10 @@
 block discarded – undo
 
 // make filelist
 try {
-	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
+    $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
 } catch (Exception $e) {
-	header("HTTP/1.0 404 Not Found");
-	exit();
+    header("HTTP/1.0 404 Not Found");
+    exit();
 }
 
 $encodedDir = \OCP\Util::encodePath($dir);

Please login to merge, or discard this patch.

apps/files_trashbin/ajax/delete.php 1 patch

Indentation +40 added lines, -40 removed lines patch added patch discarded remove patch

@@ -32,19 +32,19 @@  discard block
 block discarded – undo
 
 // "empty trash" command
 if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){
-	$deleteAll = true;
-	if ($folder === '/' || $folder === '') {
-		OCA\Files_Trashbin\Trashbin::deleteAll();
-		$list = array();
-	} else {
-		$list[] = $folder;
-		$folder = dirname($folder);
-	}
+    $deleteAll = true;
+    if ($folder === '/' || $folder === '') {
+        OCA\Files_Trashbin\Trashbin::deleteAll();
+        $list = array();
+    } else {
+        $list[] = $folder;
+        $folder = dirname($folder);
+    }
 }
 else {
-	$deleteAll = false;
-	$files = (string)$_POST['files'];
-	$list = json_decode($files);
+    $deleteAll = false;
+    $files = (string)$_POST['files'];
+    $list = json_decode($files);
 }
 
 $folder = rtrim($folder, '/') . '/';
@@ -53,38 +53,38 @@  discard block
 block discarded – undo
 
 $i = 0;
 foreach ($list as $file) {
-	if ($folder === '/') {
-		$file = ltrim($file, '/');
-		$delimiter = strrpos($file, '.d');
-		$filename = substr($file, 0, $delimiter);
-		$timestamp =  substr($file, $delimiter+2);
-	} else {
-		$filename = $folder . '/' . $file;
-		$timestamp = null;
-	}
+    if ($folder === '/') {
+        $file = ltrim($file, '/');
+        $delimiter = strrpos($file, '.d');
+        $filename = substr($file, 0, $delimiter);
+        $timestamp =  substr($file, $delimiter+2);
+    } else {
+        $filename = $folder . '/' . $file;
+        $timestamp = null;
+    }
 
-	OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
-	if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
-		$error[] = $filename;
-		\OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
-	}
-	// only list deleted files if not deleting everything
-	else if (!$deleteAll) {
-		$success[$i]['filename'] = $file;
-		$success[$i]['timestamp'] = $timestamp;
-		$i++;
-	}
+    OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
+    if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
+        $error[] = $filename;
+        \OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
+    }
+    // only list deleted files if not deleting everything
+    else if (!$deleteAll) {
+        $success[$i]['filename'] = $file;
+        $success[$i]['timestamp'] = $timestamp;
+        $i++;
+    }
 }
 
 if ( $error ) {
-	$filelist = '';
-	foreach ( $error as $e ) {
-		$filelist .= $e.', ';
-	}
-	$l = \OC::$server->getL10N('files_trashbin');
-	$message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
-	OCP\JSON::error(array("data" => array("message" => $message,
-			                               "success" => $success, "error" => $error)));
+    $filelist = '';
+    foreach ( $error as $e ) {
+        $filelist .= $e.', ';
+    }
+    $l = \OC::$server->getL10N('files_trashbin');
+    $message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
+    OCP\JSON::error(array("data" => array("message" => $message,
+                                            "success" => $success, "error" => $error)));
 } else {
-	OCP\JSON::success(array("data" => array("success" => $success)));
+    OCP\JSON::success(array("data" => array("success" => $success)));
 }

Please login to merge, or discard this patch.

apps/files_trashbin/lib/Controller/PreviewController.php 1 patch

Indentation +69 added lines, -69 removed lines patch added patch discarded remove patch

@@ -35,85 +35,85 @@
 block discarded – undo
 
 class PreviewController extends Controller {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var string */
-	private $userId;
+    /** @var string */
+    private $userId;
 
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
+    /** @var IMimeTypeDetector */
+    private $mimeTypeDetector;
 
-	/** @var IPreview */
-	private $previewManager;
+    /** @var IPreview */
+    private $previewManager;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IRootFolder $rootFolder
-	 * @param $userId
-	 * @param IMimeTypeDetector $mimeTypeDetector
-	 * @param IPreview $previewManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IRootFolder $rootFolder,
-								$userId,
-								IMimeTypeDetector $mimeTypeDetector,
-								IPreview $previewManager) {
-		parent::__construct($appName, $request);
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IRootFolder $rootFolder
+     * @param $userId
+     * @param IMimeTypeDetector $mimeTypeDetector
+     * @param IPreview $previewManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IRootFolder $rootFolder,
+                                $userId,
+                                IMimeTypeDetector $mimeTypeDetector,
+                                IPreview $previewManager) {
+        parent::__construct($appName, $request);
 
-		$this->rootFolder = $rootFolder;
-		$this->userId = $userId;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-		$this->previewManager = $previewManager;
-	}
+        $this->rootFolder = $rootFolder;
+        $this->userId = $userId;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+        $this->previewManager = $previewManager;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $file
-	 * @param int $x
-	 * @param int $y
-	 * @return DataResponse|Http\FileDisplayResponse
-	 */
-	public function getPreview(
-		$file = '',
-		$x = 44,
-		$y = 44
-	) {
-		if ($file === '') {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $file
+     * @param int $x
+     * @param int $y
+     * @return DataResponse|Http\FileDisplayResponse
+     */
+    public function getPreview(
+        $file = '',
+        $x = 44,
+        $y = 44
+    ) {
+        if ($file === '') {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		if ($x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
+        if ($x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($this->userId);
-			/** @var Folder $trash */
-			$trash = $userFolder->getParent()->get('files_trashbin/files');
-			$trashFile = $trash->get($file);
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($this->userId);
+            /** @var Folder $trash */
+            $trash = $userFolder->getParent()->get('files_trashbin/files');
+            $trashFile = $trash->get($file);
 
-			if ($trashFile instanceof Folder) {
-				return new DataResponse([], Http::STATUS_BAD_REQUEST);
-			}
+            if ($trashFile instanceof Folder) {
+                return new DataResponse([], Http::STATUS_BAD_REQUEST);
+            }
 
-			/** @var File $trashFile */
-			$fileName = $trashFile->getName();
-			$i = strrpos($fileName, '.');
-			if ($i !== false) {
-				$fileName = substr($fileName, 0, $i);
-			}
+            /** @var File $trashFile */
+            $fileName = $trashFile->getName();
+            $i = strrpos($fileName, '.');
+            if ($i !== false) {
+                $fileName = substr($fileName, 0, $i);
+            }
 
-			$mimeType = $this->mimeTypeDetector->detectPath($fileName);
+            $mimeType = $this->mimeTypeDetector->detectPath($fileName);
 
-			$f = $this->previewManager->getPreview($trashFile, $x, $y, true, IPreview::MODE_FILL, $mimeType);
-			return new Http\FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-	}
+            $f = $this->previewManager->getPreview($trashFile, $x, $y, true, IPreview::MODE_FILL, $mimeType);
+            return new Http\FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+    }
 }

Please login to merge, or discard this patch.

apps/files_trashbin/lib/AppInfo/Application.php 1 patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -27,23 +27,23 @@
 block discarded – undo
 use OCA\Files_Trashbin\Expiration;
 
 class Application extends App {
-	public function __construct (array $urlParams = []) {
-		parent::__construct('files_trashbin', $urlParams);
+    public function __construct (array $urlParams = []) {
+        parent::__construct('files_trashbin', $urlParams);
 
-		$container = $this->getContainer();
-		/*
+        $container = $this->getContainer();
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability('OCA\Files_Trashbin\Capabilities');
+        $container->registerCapability('OCA\Files_Trashbin\Capabilities');
 
-		/*
+        /*
 		 * Register expiration
 		 */
-		$container->registerService('Expiration', function($c) {
-			return  new Expiration(
-				$c->query('ServerContainer')->getConfig(),
-				$c->query('OCP\AppFramework\Utility\ITimeFactory')
-			);
-		});
-	}
+        $container->registerService('Expiration', function($c) {
+            return  new Expiration(
+                $c->query('ServerContainer')->getConfig(),
+                $c->query('OCP\AppFramework\Utility\ITimeFactory')
+            );
+        });
+    }
 }

Please login to merge, or discard this patch.

apps/files_trashbin/lib/Command/Expire.php 1 patch

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -31,30 +31,30 @@
 block discarded – undo
 use OCP\Command\ICommand;
 
 class Expire implements ICommand {
-	use FileAccess;
+    use FileAccess;
 
-	/**
-	 * @var string
-	 */
-	private $user;
+    /**
+     * @var string
+     */
+    private $user;
 
-	/**
-	 * @param string $user
-	 */
-	function __construct($user) {
-		$this->user = $user;
-	}
+    /**
+     * @param string $user
+     */
+    function __construct($user) {
+        $this->user = $user;
+    }
 
-	public function handle() {
-		$userManager = \OC::$server->getUserManager();
-		if (!$userManager->userExists($this->user)) {
-			// User has been deleted already
-			return;
-		}
+    public function handle() {
+        $userManager = \OC::$server->getUserManager();
+        if (!$userManager->userExists($this->user)) {
+            // User has been deleted already
+            return;
+        }
 
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($this->user);
-		Trashbin::expire($this->user);
-		\OC_Util::tearDownFS();
-	}
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($this->user);
+        Trashbin::expire($this->user);
+        \OC_Util::tearDownFS();
+    }
 }

Please login to merge, or discard this patch.

		@@ -26,10 +26,10 @@
		block discarded – undo
26	26
27	27	class Application extends App {
28	28
29		- public function __construct (array $urlParams = array()) {
30		- parent::__construct('comments', $urlParams);
31		- $container = $this->getContainer();
	29	+ public function __construct (array $urlParams = array()) {
	30	+ parent::__construct('comments', $urlParams);
	31	+ $container = $this->getContainer();
32	32
33		- $container->registerAlias('NotificationsController', Notifications::class);
34		- }
	33	+ $container->registerAlias('NotificationsController', Notifications::class);
	34	+ }
35	35	}

		@@ -36,56 +36,56 @@
		block discarded – undo
36	36	* @package OCA\Comments
37	37	*/
38	38	class EventHandler implements ICommentsEventHandler {
39		- /** @var ActivityListener */
40		- private $activityListener;
	39	+ /** @var ActivityListener */
	40	+ private $activityListener;
41	41
42		- /** @var NotificationListener */
43		- private $notificationListener;
	42	+ /** @var NotificationListener */
	43	+ private $notificationListener;
44	44
45		- public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) {
46		- $this->activityListener = $activityListener;
47		- $this->notificationListener = $notificationListener;
48		- }
	45	+ public function __construct(ActivityListener $activityListener, NotificationListener $notificationListener) {
	46	+ $this->activityListener = $activityListener;
	47	+ $this->notificationListener = $notificationListener;
	48	+ }
49	49
50		- /**
51		- * @param CommentsEvent $event
52		- */
53		- public function handle(CommentsEvent $event) {
54		- if($event->getComment()->getObjectType() !== 'files') {
55		- // this is a 'files'-specific Handler
56		- return;
57		- }
	50	+ /**
	51	+ * @param CommentsEvent $event
	52	+ */
	53	+ public function handle(CommentsEvent $event) {
	54	+ if($event->getComment()->getObjectType() !== 'files') {
	55	+ // this is a 'files'-specific Handler
	56	+ return;
	57	+ }
58	58
59		- $eventType = $event->getEvent();
60		- if( $eventType === CommentsEvent::EVENT_ADD
61		- ) {
62		- $this->notificationHandler($event);
63		- $this->activityHandler($event);
64		- return;
65		- }
	59	+ $eventType = $event->getEvent();
	60	+ if( $eventType === CommentsEvent::EVENT_ADD
	61	+ ) {
	62	+ $this->notificationHandler($event);
	63	+ $this->activityHandler($event);
	64	+ return;
	65	+ }
66	66
67		- $applicableEvents = [
68		- CommentsEvent::EVENT_PRE_UPDATE,
69		- CommentsEvent::EVENT_UPDATE,
70		- CommentsEvent::EVENT_DELETE,
71		- ];
72		- if(in_array($eventType, $applicableEvents)) {
73		- $this->notificationHandler($event);
74		- return;
75		- }
76		- }
	67	+ $applicableEvents = [
	68	+ CommentsEvent::EVENT_PRE_UPDATE,
	69	+ CommentsEvent::EVENT_UPDATE,
	70	+ CommentsEvent::EVENT_DELETE,
	71	+ ];
	72	+ if(in_array($eventType, $applicableEvents)) {
	73	+ $this->notificationHandler($event);
	74	+ return;
	75	+ }
	76	+ }
77	77
78		- /**
79		- * @param CommentsEvent $event
80		- */
81		- private function activityHandler(CommentsEvent $event) {
82		- $this->activityListener->commentEvent($event);
83		- }
	78	+ /**
	79	+ * @param CommentsEvent $event
	80	+ */
	81	+ private function activityHandler(CommentsEvent $event) {
	82	+ $this->activityListener->commentEvent($event);
	83	+ }
84	84
85		- /**
86		- * @param CommentsEvent $event
87		- */
88		- private function notificationHandler(CommentsEvent $event) {
89		- $this->notificationListener->evaluate($event);
90		- }
	85	+ /**
	86	+ * @param CommentsEvent $event
	87	+ */
	88	+ private function notificationHandler(CommentsEvent $event) {
	89	+ $this->notificationListener->evaluate($event);
	90	+ }
91	91	}

		@@ -24,5 +24,5 @@
		block discarded – undo
24	24
25	25	$application = new Application();
26	26	$application->registerRoutes($this, ['routes' => [
27		- ['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
	27	+ ['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
28	28	]]);

		@@ -31,25 +31,25 @@ discard block
		block discarded – undo
31	31
32	32	$dir = '/';
33	33	if (isset($_POST['dir'])) {
34		- $dir = rtrim((string)$_POST['dir'], '/'). '/';
	34	+ $dir = rtrim((string)$_POST['dir'], '/'). '/';
35	35	}
36	36	$allFiles = false;
37	37	if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true') {
38		- $allFiles = true;
39		- $list = array();
40		- $dirListing = true;
41		- if ($dir === '' \|\| $dir === '/') {
42		- $dirListing = false;
43		- }
44		- foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
45		- $fileName = $file['name'];
46		- if (!$dirListing) {
47		- $fileName .= '.d' . $file['mtime'];
48		- }
49		- $list[] = $fileName;
50		- }
	38	+ $allFiles = true;
	39	+ $list = array();
	40	+ $dirListing = true;
	41	+ if ($dir === '' \|\| $dir === '/') {
	42	+ $dirListing = false;
	43	+ }
	44	+ foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
	45	+ $fileName = $file['name'];
	46	+ if (!$dirListing) {
	47	+ $fileName .= '.d' . $file['mtime'];
	48	+ }
	49	+ $list[] = $fileName;
	50	+ }
51	51	} else {
52		- $list = json_decode($_POST['files']);
	52	+ $list = json_decode($_POST['files']);
53	53	}
54	54
55	55	$error = array();
		@@ -57,38 +57,38 @@ discard block
		block discarded – undo
57	57
58	58	$i = 0;
59	59	foreach ($list as $file) {
60		- $path = $dir . '/' . $file;
61		- if ($dir === '/') {
62		- $file = ltrim($file, '/');
63		- $delimiter = strrpos($file, '.d');
64		- $filename = substr($file, 0, $delimiter);
65		- $timestamp = substr($file, $delimiter+2);
66		- } else {
67		- $path_parts = pathinfo($file);
68		- $filename = $path_parts['basename'];
69		- $timestamp = null;
70		- }
	60	+ $path = $dir . '/' . $file;
	61	+ if ($dir === '/') {
	62	+ $file = ltrim($file, '/');
	63	+ $delimiter = strrpos($file, '.d');
	64	+ $filename = substr($file, 0, $delimiter);
	65	+ $timestamp = substr($file, $delimiter+2);
	66	+ } else {
	67	+ $path_parts = pathinfo($file);
	68	+ $filename = $path_parts['basename'];
	69	+ $timestamp = null;
	70	+ }
71	71
72		- if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
73		- $error[] = $filename;
74		- \OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR);
75		- } else {
76		- $success[$i]['filename'] = $file;
77		- $success[$i]['timestamp'] = $timestamp;
78		- $i++;
79		- }
	72	+ if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) {
	73	+ $error[] = $filename;
	74	+ \OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR);
	75	+ } else {
	76	+ $success[$i]['filename'] = $file;
	77	+ $success[$i]['timestamp'] = $timestamp;
	78	+ $i++;
	79	+ }
80	80
81	81	}
82	82
83	83	if ( $error ) {
84		- $filelist = '';
85		- foreach ( $error as $e ) {
86		- $filelist .= $e.', ';
87		- }
88		- $l = OC::$server->getL10N('files_trashbin');
89		- $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
90		- OCP\JSON::error(array("data" => array("message" => $message,
91		- "success" => $success, "error" => $error)));
	84	+ $filelist = '';
	85	+ foreach ( $error as $e ) {
	86	+ $filelist .= $e.', ';
	87	+ }
	88	+ $l = OC::$server->getL10N('files_trashbin');
	89	+ $message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
	90	+ OCP\JSON::error(array("data" => array("message" => $message,
	91	+ "success" => $success, "error" => $error)));
92	92	} else {
93		- OCP\JSON::success(array("data" => array("success" => $success)));
	93	+ OCP\JSON::success(array("data" => array("success" => $success)));
94	94	}

		@@ -32,10 +32,10 @@
		block discarded – undo
32	32
33	33	// make filelist
34	34	try {
35		- $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
	35	+ $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
36	36	} catch (Exception $e) {
37		- header("HTTP/1.0 404 Not Found");
38		- exit();
	37	+ header("HTTP/1.0 404 Not Found");
	38	+ exit();
39	39	}
40	40
41	41	$encodedDir = \OCP\Util::encodePath($dir);

		@@ -32,19 +32,19 @@ discard block
		block discarded – undo
32	32
33	33	// "empty trash" command
34	34	if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){
35		- $deleteAll = true;
36		- if ($folder === '/' \|\| $folder === '') {
37		- OCA\Files_Trashbin\Trashbin::deleteAll();
38		- $list = array();
39		- } else {
40		- $list[] = $folder;
41		- $folder = dirname($folder);
42		- }
	35	+ $deleteAll = true;
	36	+ if ($folder === '/' \|\| $folder === '') {
	37	+ OCA\Files_Trashbin\Trashbin::deleteAll();
	38	+ $list = array();
	39	+ } else {
	40	+ $list[] = $folder;
	41	+ $folder = dirname($folder);
	42	+ }
43	43	}
44	44	else {
45		- $deleteAll = false;
46		- $files = (string)$_POST['files'];
47		- $list = json_decode($files);
	45	+ $deleteAll = false;
	46	+ $files = (string)$_POST['files'];
	47	+ $list = json_decode($files);
48	48	}
49	49
50	50	$folder = rtrim($folder, '/') . '/';
		@@ -53,38 +53,38 @@ discard block
		block discarded – undo
53	53
54	54	$i = 0;
55	55	foreach ($list as $file) {
56		- if ($folder === '/') {
57		- $file = ltrim($file, '/');
58		- $delimiter = strrpos($file, '.d');
59		- $filename = substr($file, 0, $delimiter);
60		- $timestamp = substr($file, $delimiter+2);
61		- } else {
62		- $filename = $folder . '/' . $file;
63		- $timestamp = null;
64		- }
	56	+ if ($folder === '/') {
	57	+ $file = ltrim($file, '/');
	58	+ $delimiter = strrpos($file, '.d');
	59	+ $filename = substr($file, 0, $delimiter);
	60	+ $timestamp = substr($file, $delimiter+2);
	61	+ } else {
	62	+ $filename = $folder . '/' . $file;
	63	+ $timestamp = null;
	64	+ }
65	65
66		- OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
67		- if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
68		- $error[] = $filename;
69		- \OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
70		- }
71		- // only list deleted files if not deleting everything
72		- else if (!$deleteAll) {
73		- $success[$i]['filename'] = $file;
74		- $success[$i]['timestamp'] = $timestamp;
75		- $i++;
76		- }
	66	+ OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
	67	+ if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
	68	+ $error[] = $filename;
	69	+ \OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
	70	+ }
	71	+ // only list deleted files if not deleting everything
	72	+ else if (!$deleteAll) {
	73	+ $success[$i]['filename'] = $file;
	74	+ $success[$i]['timestamp'] = $timestamp;
	75	+ $i++;
	76	+ }
77	77	}
78	78
79	79	if ( $error ) {
80		- $filelist = '';
81		- foreach ( $error as $e ) {
82		- $filelist .= $e.', ';
83		- }
84		- $l = \OC::$server->getL10N('files_trashbin');
85		- $message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
86		- OCP\JSON::error(array("data" => array("message" => $message,
87		- "success" => $success, "error" => $error)));
	80	+ $filelist = '';
	81	+ foreach ( $error as $e ) {
	82	+ $filelist .= $e.', ';
	83	+ }
	84	+ $l = \OC::$server->getL10N('files_trashbin');
	85	+ $message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
	86	+ OCP\JSON::error(array("data" => array("message" => $message,
	87	+ "success" => $success, "error" => $error)));
88	88	} else {
89		- OCP\JSON::success(array("data" => array("success" => $success)));
	89	+ OCP\JSON::success(array("data" => array("success" => $success)));
90	90	}

		@@ -35,85 +35,85 @@
		block discarded – undo
35	35
36	36	class PreviewController extends Controller {
37	37
38		- /** @var IRootFolder */
39		- private $rootFolder;
	38	+ /** @var IRootFolder */
	39	+ private $rootFolder;
40	40
41		- /** @var string */
42		- private $userId;
	41	+ /** @var string */
	42	+ private $userId;
43	43
44		- /** @var IMimeTypeDetector */
45		- private $mimeTypeDetector;
	44	+ /** @var IMimeTypeDetector */
	45	+ private $mimeTypeDetector;
46	46
47		- /** @var IPreview */
48		- private $previewManager;
	47	+ /** @var IPreview */
	48	+ private $previewManager;
49	49
50		- /**
51		- * @param string $appName
52		- * @param IRequest $request
53		- * @param IRootFolder $rootFolder
54		- * @param $userId
55		- * @param IMimeTypeDetector $mimeTypeDetector
56		- * @param IPreview $previewManager
57		- */
58		- public function __construct($appName,
59		- IRequest $request,
60		- IRootFolder $rootFolder,
61		- $userId,
62		- IMimeTypeDetector $mimeTypeDetector,
63		- IPreview $previewManager) {
64		- parent::__construct($appName, $request);
	50	+ /**
	51	+ * @param string $appName
	52	+ * @param IRequest $request
	53	+ * @param IRootFolder $rootFolder
	54	+ * @param $userId
	55	+ * @param IMimeTypeDetector $mimeTypeDetector
	56	+ * @param IPreview $previewManager
	57	+ */
	58	+ public function __construct($appName,
	59	+ IRequest $request,
	60	+ IRootFolder $rootFolder,
	61	+ $userId,
	62	+ IMimeTypeDetector $mimeTypeDetector,
	63	+ IPreview $previewManager) {
	64	+ parent::__construct($appName, $request);
65	65
66		- $this->rootFolder = $rootFolder;
67		- $this->userId = $userId;
68		- $this->mimeTypeDetector = $mimeTypeDetector;
69		- $this->previewManager = $previewManager;
70		- }
	66	+ $this->rootFolder = $rootFolder;
	67	+ $this->userId = $userId;
	68	+ $this->mimeTypeDetector = $mimeTypeDetector;
	69	+ $this->previewManager = $previewManager;
	70	+ }
71	71
72		- /**
73		- * @NoAdminRequired
74		- * @NoCSRFRequired
75		- *
76		- * @param string $file
77		- * @param int $x
78		- * @param int $y
79		- * @return DataResponse\|Http\FileDisplayResponse
80		- */
81		- public function getPreview(
82		- $file = '',
83		- $x = 44,
84		- $y = 44
85		- ) {
86		- if ($file === '') {
87		- return new DataResponse([], Http::STATUS_BAD_REQUEST);
88		- }
	72	+ /**
	73	+ * @NoAdminRequired
	74	+ * @NoCSRFRequired
	75	+ *
	76	+ * @param string $file
	77	+ * @param int $x
	78	+ * @param int $y
	79	+ * @return DataResponse\|Http\FileDisplayResponse
	80	+ */
	81	+ public function getPreview(
	82	+ $file = '',
	83	+ $x = 44,
	84	+ $y = 44
	85	+ ) {
	86	+ if ($file === '') {
	87	+ return new DataResponse([], Http::STATUS_BAD_REQUEST);
	88	+ }
89	89
90		- if ($x === 0 \|\| $y === 0) {
91		- return new DataResponse([], Http::STATUS_BAD_REQUEST);
92		- }
	90	+ if ($x === 0 \|\| $y === 0) {
	91	+ return new DataResponse([], Http::STATUS_BAD_REQUEST);
	92	+ }
93	93
94		- try {
95		- $userFolder = $this->rootFolder->getUserFolder($this->userId);
96		- /** @var Folder $trash */
97		- $trash = $userFolder->getParent()->get('files_trashbin/files');
98		- $trashFile = $trash->get($file);
	94	+ try {
	95	+ $userFolder = $this->rootFolder->getUserFolder($this->userId);
	96	+ /** @var Folder $trash */
	97	+ $trash = $userFolder->getParent()->get('files_trashbin/files');
	98	+ $trashFile = $trash->get($file);
99	99
100		- if ($trashFile instanceof Folder) {
101		- return new DataResponse([], Http::STATUS_BAD_REQUEST);
102		- }
	100	+ if ($trashFile instanceof Folder) {
	101	+ return new DataResponse([], Http::STATUS_BAD_REQUEST);
	102	+ }
103	103
104		- /** @var File $trashFile */
105		- $fileName = $trashFile->getName();
106		- $i = strrpos($fileName, '.');
107		- if ($i !== false) {
108		- $fileName = substr($fileName, 0, $i);
109		- }
	104	+ /** @var File $trashFile */
	105	+ $fileName = $trashFile->getName();
	106	+ $i = strrpos($fileName, '.');
	107	+ if ($i !== false) {
	108	+ $fileName = substr($fileName, 0, $i);
	109	+ }
110	110
111		- $mimeType = $this->mimeTypeDetector->detectPath($fileName);
	111	+ $mimeType = $this->mimeTypeDetector->detectPath($fileName);
112	112
113		- $f = $this->previewManager->getPreview($trashFile, $x, $y, true, IPreview::MODE_FILL, $mimeType);
114		- return new Http\FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
115		- } catch (NotFoundException $e) {
116		- return new DataResponse([], Http::STATUS_NOT_FOUND);
117		- }
118		- }
	113	+ $f = $this->previewManager->getPreview($trashFile, $x, $y, true, IPreview::MODE_FILL, $mimeType);
	114	+ return new Http\FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
	115	+ } catch (NotFoundException $e) {
	116	+ return new DataResponse([], Http::STATUS_NOT_FOUND);
	117	+ }
	118	+ }
119	119	}

		@@ -27,23 +27,23 @@
		block discarded – undo
27	27	use OCA\Files_Trashbin\Expiration;
28	28
29	29	class Application extends App {
30		- public function __construct (array $urlParams = []) {
31		- parent::__construct('files_trashbin', $urlParams);
	30	+ public function __construct (array $urlParams = []) {
	31	+ parent::__construct('files_trashbin', $urlParams);
32	32
33		- $container = $this->getContainer();
34		- /*
	33	+ $container = $this->getContainer();
	34	+ /*
35	35	* Register capabilities
36	36	*/
37		- $container->registerCapability('OCA\Files_Trashbin\Capabilities');
	37	+ $container->registerCapability('OCA\Files_Trashbin\Capabilities');
38	38
39		- /*
	39	+ /*
40	40	* Register expiration
41	41	*/
42		- $container->registerService('Expiration', function($c) {
43		- return new Expiration(
44		- $c->query('ServerContainer')->getConfig(),
45		- $c->query('OCP\AppFramework\Utility\ITimeFactory')
46		- );
47		- });
48		- }
	42	+ $container->registerService('Expiration', function($c) {
	43	+ return new Expiration(
	44	+ $c->query('ServerContainer')->getConfig(),
	45	+ $c->query('OCP\AppFramework\Utility\ITimeFactory')
	46	+ );
	47	+ });
	48	+ }
49	49	}

		@@ -31,30 +31,30 @@
		block discarded – undo
31	31	use OCP\Command\ICommand;
32	32
33	33	class Expire implements ICommand {
34		- use FileAccess;
	34	+ use FileAccess;
35	35
36		- /**
37		- * @var string
38		- */
39		- private $user;
	36	+ /**
	37	+ * @var string
	38	+ */
	39	+ private $user;
40	40
41		- /**
42		- * @param string $user
43		- */
44		- function __construct($user) {
45		- $this->user = $user;
46		- }
	41	+ /**
	42	+ * @param string $user
	43	+ */
	44	+ function __construct($user) {
	45	+ $this->user = $user;
	46	+ }
47	47
48		- public function handle() {
49		- $userManager = \OC::$server->getUserManager();
50		- if (!$userManager->userExists($this->user)) {
51		- // User has been deleted already
52		- return;
53		- }
	48	+ public function handle() {
	49	+ $userManager = \OC::$server->getUserManager();
	50	+ if (!$userManager->userExists($this->user)) {
	51	+ // User has been deleted already
	52	+ return;
	53	+ }
54	54
55		- \OC_Util::tearDownFS();
56		- \OC_Util::setupFS($this->user);
57		- Trashbin::expire($this->user);
58		- \OC_Util::tearDownFS();
59		- }
	55	+ \OC_Util::tearDownFS();
	56	+ \OC_Util::setupFS($this->user);
	57	+ Trashbin::expire($this->user);
	58	+ \OC_Util::tearDownFS();
	59	+ }
60	60	}

nextcloud / server

Pull Request — master (#4212)

Status

Category

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +43 added lines, -43 removed lines patch added patch discarded remove patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +40 added lines, -40 removed lines patch added patch discarded remove patch

Indentation +69 added lines, -69 removed lines patch added patch discarded remove patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch