nextcloud / server

apps/files/lib/Activity/Settings/FileChanged.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class FileChanged implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'file_changed';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'file_changed';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder has been <strong>changed</strong> or <strong>renamed</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder has been <strong>changed</strong> or <strong>renamed</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 1;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 1;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

apps/files/lib/Activity/Settings/FileRestored.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class FileRestored implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'file_restored';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'file_restored';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A new file or folder has been <strong>restored</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A new file or folder has been <strong>restored</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 4;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 4;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

apps/files/lib/Activity/Settings/FileCreated.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class FileCreated implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'file_created';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'file_created';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A new file or folder has been <strong>created</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A new file or folder has been <strong>created</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 0;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 0;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

apps/files/lib/Activity/Settings/FavoriteAction.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class FavoriteAction implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'favorite';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'favorite';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file has been added to or removed from your <strong>favorites</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file has been added to or removed from your <strong>favorites</strong>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 5;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 5;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

apps/files/lib/Activity/Settings/FileFavorite.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class FileFavorite implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'file_favorite';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'file_favorite';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 2;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 2;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return false;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return false;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }
 

apps/files/lib/Service/TagService.php

Indentation +86 added lines, -86 removed lines

@@ -38,99 +38,99 @@
  */
 class TagService {
 
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IManager */
-	private $activityManager;
-	/** @var ITags */
-	private $tagger;
-	/** @var Folder */
-	private $homeFolder;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IManager */
+    private $activityManager;
+    /** @var ITags */
+    private $tagger;
+    /** @var Folder */
+    private $homeFolder;
 
-	/**
-	 * @param IUserSession $userSession
-	 * @param IManager $activityManager
-	 * @param ITags $tagger
-	 * @param Folder $homeFolder
-	 */
-	public function __construct(
-		IUserSession $userSession,
-		IManager $activityManager,
-		ITags $tagger,
-		Folder $homeFolder
-	) {
-		$this->userSession = $userSession;
-		$this->activityManager = $activityManager;
-		$this->tagger = $tagger;
-		$this->homeFolder = $homeFolder;
-	}
+    /**
+     * @param IUserSession $userSession
+     * @param IManager $activityManager
+     * @param ITags $tagger
+     * @param Folder $homeFolder
+     */
+    public function __construct(
+        IUserSession $userSession,
+        IManager $activityManager,
+        ITags $tagger,
+        Folder $homeFolder
+    ) {
+        $this->userSession = $userSession;
+        $this->activityManager = $activityManager;
+        $this->tagger = $tagger;
+        $this->homeFolder = $homeFolder;
+    }
 
-	/**
-	 * Updates the tags of the specified file path.
-	 * The passed tags are absolute, which means they will
-	 * replace the actual tag selection.
-	 *
-	 * @param string $path path
-	 * @param array  $tags array of tags
-	 * @return array list of tags
-	 * @throws \OCP\Files\NotFoundException if the file does not exist
-	 */
-	public function updateFileTags($path, $tags) {
-		$fileId = $this->homeFolder->get($path)->getId();
+    /**
+     * Updates the tags of the specified file path.
+     * The passed tags are absolute, which means they will
+     * replace the actual tag selection.
+     *
+     * @param string $path path
+     * @param array  $tags array of tags
+     * @return array list of tags
+     * @throws \OCP\Files\NotFoundException if the file does not exist
+     */
+    public function updateFileTags($path, $tags) {
+        $fileId = $this->homeFolder->get($path)->getId();
 
-		$currentTags = $this->tagger->getTagsForObjects(array($fileId));
+        $currentTags = $this->tagger->getTagsForObjects(array($fileId));
 
-		if (!empty($currentTags)) {
-			$currentTags = current($currentTags);
-		}
+        if (!empty($currentTags)) {
+            $currentTags = current($currentTags);
+        }
 
-		$newTags = array_diff($tags, $currentTags);
-		foreach ($newTags as $tag) {
-			if ($tag === Tags::TAG_FAVORITE) {
-				$this->addActivity(true, $fileId, $path);
-			}
-			$this->tagger->tagAs($fileId, $tag);
-		}
-		$deletedTags = array_diff($currentTags, $tags);
-		foreach ($deletedTags as $tag) {
-			if ($tag === Tags::TAG_FAVORITE) {
-				$this->addActivity(false, $fileId, $path);
-			}
-			$this->tagger->unTag($fileId, $tag);
-		}
+        $newTags = array_diff($tags, $currentTags);
+        foreach ($newTags as $tag) {
+            if ($tag === Tags::TAG_FAVORITE) {
+                $this->addActivity(true, $fileId, $path);
+            }
+            $this->tagger->tagAs($fileId, $tag);
+        }
+        $deletedTags = array_diff($currentTags, $tags);
+        foreach ($deletedTags as $tag) {
+            if ($tag === Tags::TAG_FAVORITE) {
+                $this->addActivity(false, $fileId, $path);
+            }
+            $this->tagger->unTag($fileId, $tag);
+        }
 
-		// TODO: re-read from tagger to make sure the
-		// list is up to date, in case of concurrent changes ?
-		return $tags;
-	}
+        // TODO: re-read from tagger to make sure the
+        // list is up to date, in case of concurrent changes ?
+        return $tags;
+    }
 
-	/**
-	 * @param bool $addToFavorite
-	 * @param int $fileId
-	 * @param string $path
-	 */
-	protected function addActivity($addToFavorite, $fileId, $path) {
-		$user = $this->userSession->getUser();
-		if (!$user instanceof IUser) {
-			return;
-		}
+    /**
+     * @param bool $addToFavorite
+     * @param int $fileId
+     * @param string $path
+     */
+    protected function addActivity($addToFavorite, $fileId, $path) {
+        $user = $this->userSession->getUser();
+        if (!$user instanceof IUser) {
+            return;
+        }
 
-		$event = $this->activityManager->generateEvent();
-		try {
-			$event->setApp('files')
-				->setObject('files', $fileId, $path)
-				->setType('favorite')
-				->setAuthor($user->getUID())
-				->setAffectedUser($user->getUID())
-				->setTimestamp(time())
-				->setSubject(
-					$addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
-					['id' => $fileId, 'path' => $path]
-				);
-			$this->activityManager->publish($event);
-		} catch (\InvalidArgumentException $e) {
-		} catch (\BadMethodCallException $e) {
-		}
-	}
+        $event = $this->activityManager->generateEvent();
+        try {
+            $event->setApp('files')
+                ->setObject('files', $fileId, $path)
+                ->setType('favorite')
+                ->setAuthor($user->getUID())
+                ->setAffectedUser($user->getUID())
+                ->setTimestamp(time())
+                ->setSubject(
+                    $addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
+                    ['id' => $fileId, 'path' => $path]
+                );
+            $this->activityManager->publish($event);
+        } catch (\InvalidArgumentException $e) {
+        } catch (\BadMethodCallException $e) {
+        }
+    }
 }
 

apps/files/lib/App.php

Indentation +16 added lines, -16 removed lines

@@ -27,22 +27,22 @@
 namespace OCA\Files;
 
 class App {
-	/**
-	 * @var \OCP\INavigationManager
-	 */
-	private static $navigationManager;
+    /**
+     * @var \OCP\INavigationManager
+     */
+    private static $navigationManager;
 
-	/**
-	 * Returns the app's navigation manager
-	 *
-	 * @return \OCP\INavigationManager
-	 */
-	public static function getNavigationManager() {
-		// TODO: move this into a service in the Application class
-		if (self::$navigationManager === null) {
-			self::$navigationManager = new \OC\NavigationManager();
-		}
-		return self::$navigationManager;
-	}
+    /**
+     * Returns the app's navigation manager
+     *
+     * @return \OCP\INavigationManager
+     */
+    public static function getNavigationManager() {
+        // TODO: move this into a service in the Application class
+        if (self::$navigationManager === null) {
+            self::$navigationManager = new \OC\NavigationManager();
+        }
+        return self::$navigationManager;
+    }
 
 }

apps/files/lib/Controller/SettingsController.php

Indentation +17 added lines, -17 removed lines

@@ -29,23 +29,23 @@
 use OCP\Util;
 
 class SettingsController extends Controller {
-	public function __construct($appName, IRequest $request) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct($appName, IRequest $request) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * @param string $maxUploadSize
-	 * @return JSONResponse
-	 */
-	public function setMaxUploadSize($maxUploadSize) {
-		$setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize));
+    /**
+     * @param string $maxUploadSize
+     * @return JSONResponse
+     */
+    public function setMaxUploadSize($maxUploadSize) {
+        $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize));
 
-		if ($setMaxSize === false) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		} else {
-			return new JSONResponse([
-				'maxUploadSize' => Util::humanFileSize($setMaxSize)
-			]);
-		}
-	}
+        if ($setMaxSize === false) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        } else {
+            return new JSONResponse([
+                'maxUploadSize' => Util::humanFileSize($setMaxSize)
+            ]);
+        }
+    }
 }

apps/files/lib/Controller/ViewController.php

Indentation +215 added lines, -215 removed lines

@@ -49,241 +49,241 @@
  * @package OCA\Files\Controller
  */
 class ViewController extends Controller {
-	/** @var string */
-	protected $appName;
-	/** @var IRequest */
-	protected $request;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var IConfig */
-	protected $config;
-	/** @var EventDispatcherInterface */
-	protected $eventDispatcher;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var IAppManager */
-	protected $appManager;
-	/** @var IRootFolder */
-	protected $rootFolder;
+    /** @var string */
+    protected $appName;
+    /** @var IRequest */
+    protected $request;
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var IConfig */
+    protected $config;
+    /** @var EventDispatcherInterface */
+    protected $eventDispatcher;
+    /** @var IUserSession */
+    protected $userSession;
+    /** @var IAppManager */
+    protected $appManager;
+    /** @var IRootFolder */
+    protected $rootFolder;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $eventDispatcherInterface
-	 * @param IUserSession $userSession
-	 * @param IAppManager $appManager
-	 * @param IRootFolder $rootFolder
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IURLGenerator $urlGenerator,
-								IL10N $l10n,
-								IConfig $config,
-								EventDispatcherInterface $eventDispatcherInterface,
-								IUserSession $userSession,
-								IAppManager $appManager,
-								IRootFolder $rootFolder
-	) {
-		parent::__construct($appName, $request);
-		$this->appName = $appName;
-		$this->request = $request;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->eventDispatcher = $eventDispatcherInterface;
-		$this->userSession = $userSession;
-		$this->appManager = $appManager;
-		$this->rootFolder = $rootFolder;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IURLGenerator $urlGenerator
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param EventDispatcherInterface $eventDispatcherInterface
+     * @param IUserSession $userSession
+     * @param IAppManager $appManager
+     * @param IRootFolder $rootFolder
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IURLGenerator $urlGenerator,
+                                IL10N $l10n,
+                                IConfig $config,
+                                EventDispatcherInterface $eventDispatcherInterface,
+                                IUserSession $userSession,
+                                IAppManager $appManager,
+                                IRootFolder $rootFolder
+    ) {
+        parent::__construct($appName, $request);
+        $this->appName = $appName;
+        $this->request = $request;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->config = $config;
+        $this->eventDispatcher = $eventDispatcherInterface;
+        $this->userSession = $userSession;
+        $this->appManager = $appManager;
+        $this->rootFolder = $rootFolder;
+    }
 
-	/**
-	 * @param string $appName
-	 * @param string $scriptName
-	 * @return string
-	 */
-	protected function renderScript($appName, $scriptName) {
-		$content = '';
-		$appPath = \OC_App::getAppPath($appName);
-		$scriptPath = $appPath . '/' . $scriptName;
-		if (file_exists($scriptPath)) {
-			// TODO: sanitize path / script name ?
-			ob_start();
-			include $scriptPath;
-			$content = ob_get_contents();
-			@ob_end_clean();
-		}
-		return $content;
-	}
+    /**
+     * @param string $appName
+     * @param string $scriptName
+     * @return string
+     */
+    protected function renderScript($appName, $scriptName) {
+        $content = '';
+        $appPath = \OC_App::getAppPath($appName);
+        $scriptPath = $appPath . '/' . $scriptName;
+        if (file_exists($scriptPath)) {
+            // TODO: sanitize path / script name ?
+            ob_start();
+            include $scriptPath;
+            $content = ob_get_contents();
+            @ob_end_clean();
+        }
+        return $content;
+    }
 
-	/**
-	 * FIXME: Replace with non static code
-	 *
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	protected function getStorageInfo() {
-		$dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
-		return \OC_Helper::getStorageInfo('/', $dirInfo);
-	}
+    /**
+     * FIXME: Replace with non static code
+     *
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    protected function getStorageInfo() {
+        $dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
+        return \OC_Helper::getStorageInfo('/', $dirInfo);
+    }
 
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $dir
-	 * @param string $view
-	 * @param string $fileid
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
-		if ($fileid !== null) {
-			try {
-				return $this->showFile($fileid);
-			} catch (NotFoundException $e) {
-				return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
-			}
-		}
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     *
+     * @param string $dir
+     * @param string $view
+     * @param string $fileid
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
+        if ($fileid !== null) {
+            try {
+                return $this->showFile($fileid);
+            } catch (NotFoundException $e) {
+                return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
+            }
+        }
 
-		$nav = new \OCP\Template('files', 'appnavigation', '');
+        $nav = new \OCP\Template('files', 'appnavigation', '');
 
-		// Load the files we need
-		\OCP\Util::addStyle('files', 'files');
-		\OCP\Util::addStyle('files', 'upload');
-		\OCP\Util::addStyle('files', 'mobile');
-		\OCP\Util::addScript('files', 'app');
-		\OCP\Util::addScript('files', 'file-upload');
-		\OCP\Util::addScript('files', 'newfilemenu');
-		\OCP\Util::addScript('files', 'jquery.fileupload');
-		\OCP\Util::addScript('files', 'jquery-visibility');
-		\OCP\Util::addScript('files', 'fileinfomodel');
-		\OCP\Util::addScript('files', 'filesummary');
-		\OCP\Util::addScript('files', 'breadcrumb');
-		\OCP\Util::addScript('files', 'filelist');
-		\OCP\Util::addScript('files', 'search');
+        // Load the files we need
+        \OCP\Util::addStyle('files', 'files');
+        \OCP\Util::addStyle('files', 'upload');
+        \OCP\Util::addStyle('files', 'mobile');
+        \OCP\Util::addScript('files', 'app');
+        \OCP\Util::addScript('files', 'file-upload');
+        \OCP\Util::addScript('files', 'newfilemenu');
+        \OCP\Util::addScript('files', 'jquery.fileupload');
+        \OCP\Util::addScript('files', 'jquery-visibility');
+        \OCP\Util::addScript('files', 'fileinfomodel');
+        \OCP\Util::addScript('files', 'filesummary');
+        \OCP\Util::addScript('files', 'breadcrumb');
+        \OCP\Util::addScript('files', 'filelist');
+        \OCP\Util::addScript('files', 'search');
 
-		\OCP\Util::addScript('files', 'favoritesfilelist');
-		\OCP\Util::addScript('files', 'recentfilelist');
-		\OCP\Util::addScript('files', 'tagsplugin');
-		\OCP\Util::addScript('files', 'gotoplugin');
-		\OCP\Util::addScript('files', 'favoritesplugin');
-		\OCP\Util::addScript('files', 'recentplugin');
+        \OCP\Util::addScript('files', 'favoritesfilelist');
+        \OCP\Util::addScript('files', 'recentfilelist');
+        \OCP\Util::addScript('files', 'tagsplugin');
+        \OCP\Util::addScript('files', 'gotoplugin');
+        \OCP\Util::addScript('files', 'favoritesplugin');
+        \OCP\Util::addScript('files', 'recentplugin');
 
-		\OCP\Util::addScript('files', 'detailfileinfoview');
-		\OCP\Util::addScript('files', 'sidebarpreviewmanager');
-		\OCP\Util::addScript('files', 'sidebarpreviewtext');
-		\OCP\Util::addScript('files', 'detailtabview');
-		\OCP\Util::addScript('files', 'mainfileinfodetailview');
-		\OCP\Util::addScript('files', 'detailsview');
-		\OCP\Util::addStyle('files', 'detailsView');
+        \OCP\Util::addScript('files', 'detailfileinfoview');
+        \OCP\Util::addScript('files', 'sidebarpreviewmanager');
+        \OCP\Util::addScript('files', 'sidebarpreviewtext');
+        \OCP\Util::addScript('files', 'detailtabview');
+        \OCP\Util::addScript('files', 'mainfileinfodetailview');
+        \OCP\Util::addScript('files', 'detailsview');
+        \OCP\Util::addStyle('files', 'detailsView');
 
-		\OC_Util::addVendorScript('core', 'handlebars/handlebars');
+        \OC_Util::addVendorScript('core', 'handlebars/handlebars');
 
-		\OCP\Util::addScript('files', 'fileactions');
-		\OCP\Util::addScript('files', 'fileactionsmenu');
-		\OCP\Util::addScript('files', 'files');
-		\OCP\Util::addScript('files', 'keyboardshortcuts');
-		\OCP\Util::addScript('files', 'navigation');
+        \OCP\Util::addScript('files', 'fileactions');
+        \OCP\Util::addScript('files', 'fileactionsmenu');
+        \OCP\Util::addScript('files', 'files');
+        \OCP\Util::addScript('files', 'keyboardshortcuts');
+        \OCP\Util::addScript('files', 'navigation');
 
-		// mostly for the home storage's free space
-		// FIXME: Make non static
-		$storageInfo = $this->getStorageInfo();
+        // mostly for the home storage's free space
+        // FIXME: Make non static
+        $storageInfo = $this->getStorageInfo();
 
-		\OCA\Files\App::getNavigationManager()->add(
-			[
-				'id' => 'favorites',
-				'appname' => 'files',
-				'script' => 'simplelist.php',
-				'order' => 5,
-				'name' => $this->l10n->t('Favorites')
-			]
-		);
+        \OCA\Files\App::getNavigationManager()->add(
+            [
+                'id' => 'favorites',
+                'appname' => 'files',
+                'script' => 'simplelist.php',
+                'order' => 5,
+                'name' => $this->l10n->t('Favorites')
+            ]
+        );
 
-		$navItems = \OCA\Files\App::getNavigationManager()->getAll();
-		usort($navItems, function($item1, $item2) {
-			return $item1['order'] - $item2['order'];
-		});
-		$nav->assign('navigationItems', $navItems);
+        $navItems = \OCA\Files\App::getNavigationManager()->getAll();
+        usort($navItems, function($item1, $item2) {
+            return $item1['order'] - $item2['order'];
+        });
+        $nav->assign('navigationItems', $navItems);
 
-		$contentItems = [];
+        $contentItems = [];
 
-		// render the container content for every navigation item
-		foreach ($navItems as $item) {
-			$content = '';
-			if (isset($item['script'])) {
-				$content = $this->renderScript($item['appname'], $item['script']);
-			}
-			$contentItem = [];
-			$contentItem['id'] = $item['id'];
-			$contentItem['content'] = $content;
-			$contentItems[] = $contentItem;
-		}
+        // render the container content for every navigation item
+        foreach ($navItems as $item) {
+            $content = '';
+            if (isset($item['script'])) {
+                $content = $this->renderScript($item['appname'], $item['script']);
+            }
+            $contentItem = [];
+            $contentItem['id'] = $item['id'];
+            $contentItem['content'] = $content;
+            $contentItems[] = $contentItem;
+        }
 
-		$this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts');
+        $this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts');
 
-		$params = [];
-		$params['usedSpacePercent'] = (int)$storageInfo['relative'];
-		$params['owner'] = $storageInfo['owner'];
-		$params['ownerDisplayName'] = $storageInfo['ownerDisplayName'];
-		$params['isPublic'] = false;
-		$params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
-		$user = $this->userSession->getUser()->getUID();
-		$params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
-		$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
-		$showHidden = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
-		$params['showHiddenFiles'] = $showHidden ? 1 : 0;
-		$params['fileNotFound'] = $fileNotFound ? 1 : 0;
-		$params['appNavigation'] = $nav;
-		$params['appContents'] = $contentItems;
+        $params = [];
+        $params['usedSpacePercent'] = (int)$storageInfo['relative'];
+        $params['owner'] = $storageInfo['owner'];
+        $params['ownerDisplayName'] = $storageInfo['ownerDisplayName'];
+        $params['isPublic'] = false;
+        $params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
+        $user = $this->userSession->getUser()->getUID();
+        $params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
+        $params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
+        $showHidden = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
+        $params['showHiddenFiles'] = $showHidden ? 1 : 0;
+        $params['fileNotFound'] = $fileNotFound ? 1 : 0;
+        $params['appNavigation'] = $nav;
+        $params['appContents'] = $contentItems;
 
-		$response = new TemplateResponse(
-			$this->appName,
-			'index',
-			$params
-		);
-		$policy = new ContentSecurityPolicy();
-		$policy->addAllowedFrameDomain('\'self\'');
-		$response->setContentSecurityPolicy($policy);
+        $response = new TemplateResponse(
+            $this->appName,
+            'index',
+            $params
+        );
+        $policy = new ContentSecurityPolicy();
+        $policy->addAllowedFrameDomain('\'self\'');
+        $response->setContentSecurityPolicy($policy);
 
-		return $response;
-	}
+        return $response;
+    }
 
-	/**
-	 * Redirects to the file list and highlight the given file id
-	 *
-	 * @param string $fileId file id to show
-	 * @return RedirectResponse redirect response or not found response
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function showFile($fileId) {
-		$uid = $this->userSession->getUser()->getUID();
-		$baseFolder = $this->rootFolder->getUserFolder($uid);
-		$files = $baseFolder->getById($fileId);
-		$params = [];
+    /**
+     * Redirects to the file list and highlight the given file id
+     *
+     * @param string $fileId file id to show
+     * @return RedirectResponse redirect response or not found response
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function showFile($fileId) {
+        $uid = $this->userSession->getUser()->getUID();
+        $baseFolder = $this->rootFolder->getUserFolder($uid);
+        $files = $baseFolder->getById($fileId);
+        $params = [];
 
-		if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
-			$baseFolder = $this->rootFolder->get($uid . '/files_trashbin/files/');
-			$files = $baseFolder->getById($fileId);
-			$params['view'] = 'trashbin';
-		}
+        if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
+            $baseFolder = $this->rootFolder->get($uid . '/files_trashbin/files/');
+            $files = $baseFolder->getById($fileId);
+            $params['view'] = 'trashbin';
+        }
 
-		if (!empty($files)) {
-			$file = current($files);
-			if ($file instanceof Folder) {
-				// set the full path to enter the folder
-				$params['dir'] = $baseFolder->getRelativePath($file->getPath());
-			} else {
-				// set parent path as dir
-				$params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
-				// and scroll to the entry
-				$params['scrollto'] = $file->getName();
-			}
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
-		}
-		throw new \OCP\Files\NotFoundException();
-	}
+        if (!empty($files)) {
+            $file = current($files);
+            if ($file instanceof Folder) {
+                // set the full path to enter the folder
+                $params['dir'] = $baseFolder->getRelativePath($file->getPath());
+            } else {
+                // set parent path as dir
+                $params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
+                // and scroll to the entry
+                $params['scrollto'] = $file->getName();
+            }
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
+        }
+        throw new \OCP\Files\NotFoundException();
+    }
 }