nextcloud / server

apps/files/lib/Activity/Filter/Favorites.php

Indentation +118 added lines, -118 removed lines

@@ -32,129 +32,129 @@
 
 class Favorites implements IFilter {
 
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var Helper */
-	protected $helper;
-
-	/** @var IDBConnection */
-	protected $db;
-
-	/**
-	 * @param IL10N $l
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param Helper $helper
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IL10N $l, IURLGenerator $url, IManager $activityManager, Helper $helper, IDBConnection $db) {
-		$this->l = $l;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->helper = $helper;
-		$this->db = $db;
-	}
-
-	/**
-	 * @return string Lowercase a-z only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'files_favorites';
-	}
-
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('Favorites');
-	}
-
-	/**
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 10;
-	}
-
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star-dark.svg'));
-	}
-
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function filterTypes(array $types) {
-		return array_intersect([
-			'file_created',
-			'file_changed',
-			'file_deleted',
-			'file_restored',
-		], $types);
-	}
-
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return ['files'];
-	}
-
-	/**
-	 * @param IQueryBuilder $query
-	 */
-	public function filterFavorites(IQueryBuilder $query) {
-		try {
-			$user = $this->activityManager->getCurrentUserId();
-		} catch (\UnexpectedValueException $e) {
-			return;
-		}
-
-		try {
-			$favorites = $this->helper->getFavoriteFilePaths($user);
-		} catch (\RuntimeException $e) {
-			return;
-		}
-
-		$limitations = [];
-		if (!empty($favorites['items'])) {
-			$limitations[] = $query->expr()->in('file', $query->createNamedParameter($favorites['items'], IQueryBuilder::PARAM_STR_ARRAY));
-		}
-		foreach ($favorites['folders'] as $favorite) {
-			$limitations[] = $query->expr()->like('file', $query->createNamedParameter(
-				$this->db->escapeLikeParameter($favorite . '/') . '%'
-			));
-		}
-
-		if (empty($limitations)) {
-			return;
-		}
-
-		$function = $query->createFunction('
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var Helper */
+    protected $helper;
+
+    /** @var IDBConnection */
+    protected $db;
+
+    /**
+     * @param IL10N $l
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param Helper $helper
+     * @param IDBConnection $db
+     */
+    public function __construct(IL10N $l, IURLGenerator $url, IManager $activityManager, Helper $helper, IDBConnection $db) {
+        $this->l = $l;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->helper = $helper;
+        $this->db = $db;
+    }
+
+    /**
+     * @return string Lowercase a-z only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'files_favorites';
+    }
+
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('Favorites');
+    }
+
+    /**
+     * @return int
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 10;
+    }
+
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star-dark.svg'));
+    }
+
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function filterTypes(array $types) {
+        return array_intersect([
+            'file_created',
+            'file_changed',
+            'file_deleted',
+            'file_restored',
+        ], $types);
+    }
+
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return ['files'];
+    }
+
+    /**
+     * @param IQueryBuilder $query
+     */
+    public function filterFavorites(IQueryBuilder $query) {
+        try {
+            $user = $this->activityManager->getCurrentUserId();
+        } catch (\UnexpectedValueException $e) {
+            return;
+        }
+
+        try {
+            $favorites = $this->helper->getFavoriteFilePaths($user);
+        } catch (\RuntimeException $e) {
+            return;
+        }
+
+        $limitations = [];
+        if (!empty($favorites['items'])) {
+            $limitations[] = $query->expr()->in('file', $query->createNamedParameter($favorites['items'], IQueryBuilder::PARAM_STR_ARRAY));
+        }
+        foreach ($favorites['folders'] as $favorite) {
+            $limitations[] = $query->expr()->like('file', $query->createNamedParameter(
+                $this->db->escapeLikeParameter($favorite . '/') . '%'
+            ));
+        }
+
+        if (empty($limitations)) {
+            return;
+        }
+
+        $function = $query->createFunction('
 			CASE 
 				WHEN ' . $query->getColumnName('app') . ' <> ' . $query->createNamedParameter('files') . ' THEN 1
 				WHEN ' . $query->getColumnName('app') . ' = ' . $query->createNamedParameter('files') . '
 					AND (' . implode(' OR ', $limitations) . ')
 					THEN 1 
 			END = 1'
-		);
+        );
 
-		$query->andWhere($function);
-	}
+        $query->andWhere($function);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -138,7 +138,7 @@ 
 		}
 		foreach ($favorites['folders'] as $favorite) {
 			$limitations[] = $query->expr()->like('file', $query->createNamedParameter(
-				$this->db->escapeLikeParameter($favorite . '/') . '%'
+				$this->db->escapeLikeParameter($favorite.'/').'%'
 			));
 		}
 
@@ -148,9 +148,9 @@ 
 
 		$function = $query->createFunction('
 			CASE 
-				WHEN ' . $query->getColumnName('app') . ' <> ' . $query->createNamedParameter('files') . ' THEN 1
-				WHEN ' . $query->getColumnName('app') . ' = ' . $query->createNamedParameter('files') . '
-					AND (' . implode(' OR ', $limitations) . ')
+				WHEN ' . $query->getColumnName('app').' <> '.$query->createNamedParameter('files').' THEN 1
+				WHEN ' . $query->getColumnName('app').' = '.$query->createNamedParameter('files').'
+					AND (' . implode(' OR ', $limitations).')
 					THEN 1 
 			END = 1'
 		);

apps/files/lib/Activity/Helper.php

Indentation +48 added lines, -48 removed lines

@@ -26,60 +26,60 @@
 use OCP\ITagManager;
 
 class Helper {
-	/** If a user has a lot of favorites the query might get too slow and long */
-	const FAVORITE_LIMIT = 50;
+    /** If a user has a lot of favorites the query might get too slow and long */
+    const FAVORITE_LIMIT = 50;
 
-	/** @var ITagManager */
-	protected $tagManager;
+    /** @var ITagManager */
+    protected $tagManager;
 
-	/**
-	 * @param ITagManager $tagManager
-	 */
-	public function __construct(ITagManager $tagManager) {
-		$this->tagManager = $tagManager;
-	}
+    /**
+     * @param ITagManager $tagManager
+     */
+    public function __construct(ITagManager $tagManager) {
+        $this->tagManager = $tagManager;
+    }
 
-	/**
-	 * Returns an array with the favorites
-	 *
-	 * @param string $user
-	 * @return array
-	 * @throws \RuntimeException when too many or no favorites where found
-	 */
-	public function getFavoriteFilePaths($user) {
-		$tags = $this->tagManager->load('files', [], false, $user);
-		$favorites = $tags->getFavorites();
+    /**
+     * Returns an array with the favorites
+     *
+     * @param string $user
+     * @return array
+     * @throws \RuntimeException when too many or no favorites where found
+     */
+    public function getFavoriteFilePaths($user) {
+        $tags = $this->tagManager->load('files', [], false, $user);
+        $favorites = $tags->getFavorites();
 
-		if (empty($favorites)) {
-			throw new \RuntimeException('No favorites', 1);
-		} else if (isset($favorites[self::FAVORITE_LIMIT])) {
-			throw new \RuntimeException('Too many favorites', 2);
-		}
+        if (empty($favorites)) {
+            throw new \RuntimeException('No favorites', 1);
+        } else if (isset($favorites[self::FAVORITE_LIMIT])) {
+            throw new \RuntimeException('Too many favorites', 2);
+        }
 
-		// Can not DI because the user is not known on instantiation
-		$rootFolder = \OC::$server->getUserFolder($user);
-		$folders = $items = [];
-		foreach ($favorites as $favorite) {
-			$nodes = $rootFolder->getById($favorite);
-			if (!empty($nodes)) {
-				/** @var \OCP\Files\Node $node */
-				$node = array_shift($nodes);
-				$path = substr($node->getPath(), strlen($user . '/files/'));
+        // Can not DI because the user is not known on instantiation
+        $rootFolder = \OC::$server->getUserFolder($user);
+        $folders = $items = [];
+        foreach ($favorites as $favorite) {
+            $nodes = $rootFolder->getById($favorite);
+            if (!empty($nodes)) {
+                /** @var \OCP\Files\Node $node */
+                $node = array_shift($nodes);
+                $path = substr($node->getPath(), strlen($user . '/files/'));
 
-				$items[] = $path;
-				if ($node instanceof Folder) {
-					$folders[] = $path;
-				}
-			}
-		}
+                $items[] = $path;
+                if ($node instanceof Folder) {
+                    $folders[] = $path;
+                }
+            }
+        }
 
-		if (empty($items)) {
-			throw new \RuntimeException('No favorites', 1);
-		}
+        if (empty($items)) {
+            throw new \RuntimeException('No favorites', 1);
+        }
 
-		return [
-			'items' => $items,
-			'folders' => $folders,
-		];
-	}
+        return [
+            'items' => $items,
+            'folders' => $folders,
+        ];
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 			if (!empty($nodes)) {
 				/** @var \OCP\Files\Node $node */
 				$node = array_shift($nodes);
-				$path = substr($node->getPath(), strlen($user . '/files/'));
+				$path = substr($node->getPath(), strlen($user.'/files/'));
 
 				$items[] = $path;
 				if ($node instanceof Folder) {

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/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/Helper.php

Braces +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 			} elseif ($file->isMounted()) {
 				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
 			}
-		}else{
+		} else{
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
 		}
 

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
 			'freeSpace' => $storageInfo['free'],
 			'quota' => $storageInfo['quota'],
 			'used' => $storageInfo['used'],
-			'usedSpacePercent'  => (int)$storageInfo['relative'],
+			'usedSpacePercent'  => (int) $storageInfo['relative'],
 			'owner' => $storageInfo['owner'],
 			'ownerDisplayName' => $storageInfo['ownerDisplayName'],
 		];
@@ -71,7 +71,7 @@ 
 	 * @return string icon URL
 	 */
 	public static function determineIcon($file) {
-		if($file['type'] === 'dir') {
+		if ($file['type'] === 'dir') {
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
 			// TODO: move this part to the client side, using mountType
 			if ($file->isShared()) {
@@ -79,11 +79,11 @@ 
 			} elseif ($file->isMounted()) {
 				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
 			}
-		}else{
+		} else {
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
 		}
 
-		return substr($icon, 0, -3) . 'svg';
+		return substr($icon, 0, -3).'svg';
 	}
 
 	/**

Indentation +208 added lines, -208 removed lines

@@ -40,232 +40,232 @@
  * Helper class for manipulating file information
  */
 class Helper {
-	/**
-	 * @param string $dir
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public static function buildFileStorageStatistics($dir) {
-		// information about storage capacities
-		$storageInfo = \OC_Helper::getStorageInfo($dir);
-		$l = \OC::$server->getL10N('files');
-		$maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
-		$maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
-		$maxHumanFileSize = $l->t('Upload (max. %s)', [$maxHumanFileSize]);
+    /**
+     * @param string $dir
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    public static function buildFileStorageStatistics($dir) {
+        // information about storage capacities
+        $storageInfo = \OC_Helper::getStorageInfo($dir);
+        $l = \OC::$server->getL10N('files');
+        $maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
+        $maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
+        $maxHumanFileSize = $l->t('Upload (max. %s)', [$maxHumanFileSize]);
 
-		return [
-			'uploadMaxFilesize' => $maxUploadFileSize,
-			'maxHumanFilesize'  => $maxHumanFileSize,
-			'freeSpace' => $storageInfo['free'],
-			'quota' => $storageInfo['quota'],
-			'used' => $storageInfo['used'],
-			'usedSpacePercent'  => (int)$storageInfo['relative'],
-			'owner' => $storageInfo['owner'],
-			'ownerDisplayName' => $storageInfo['ownerDisplayName'],
-		];
-	}
+        return [
+            'uploadMaxFilesize' => $maxUploadFileSize,
+            'maxHumanFilesize'  => $maxHumanFileSize,
+            'freeSpace' => $storageInfo['free'],
+            'quota' => $storageInfo['quota'],
+            'used' => $storageInfo['used'],
+            'usedSpacePercent'  => (int)$storageInfo['relative'],
+            'owner' => $storageInfo['owner'],
+            'ownerDisplayName' => $storageInfo['ownerDisplayName'],
+        ];
+    }
 
-	/**
-	 * Determine icon for a given file
-	 *
-	 * @param \OCP\Files\FileInfo $file file info
-	 * @return string icon URL
-	 */
-	public static function determineIcon($file) {
-		if($file['type'] === 'dir') {
-			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
-			// TODO: move this part to the client side, using mountType
-			if ($file->isShared()) {
-				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-shared');
-			} elseif ($file->isMounted()) {
-				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
-			}
-		}else{
-			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
-		}
+    /**
+     * Determine icon for a given file
+     *
+     * @param \OCP\Files\FileInfo $file file info
+     * @return string icon URL
+     */
+    public static function determineIcon($file) {
+        if($file['type'] === 'dir') {
+            $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
+            // TODO: move this part to the client side, using mountType
+            if ($file->isShared()) {
+                $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-shared');
+            } elseif ($file->isMounted()) {
+                $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
+            }
+        }else{
+            $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
+        }
 
-		return substr($icon, 0, -3) . 'svg';
-	}
+        return substr($icon, 0, -3) . 'svg';
+    }
 
-	/**
-	 * Comparator function to sort files alphabetically and have
-	 * the directories appear first
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareFileNames(FileInfo $a, FileInfo $b) {
-		$aType = $a->getType();
-		$bType = $b->getType();
-		if ($aType === 'dir' and $bType !== 'dir') {
-			return -1;
-		} elseif ($aType !== 'dir' and $bType === 'dir') {
-			return 1;
-		} else {
-			return \OCP\Util::naturalSortCompare($a->getName(), $b->getName());
-		}
-	}
+    /**
+     * Comparator function to sort files alphabetically and have
+     * the directories appear first
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareFileNames(FileInfo $a, FileInfo $b) {
+        $aType = $a->getType();
+        $bType = $b->getType();
+        if ($aType === 'dir' and $bType !== 'dir') {
+            return -1;
+        } elseif ($aType !== 'dir' and $bType === 'dir') {
+            return 1;
+        } else {
+            return \OCP\Util::naturalSortCompare($a->getName(), $b->getName());
+        }
+    }
 
-	/**
-	 * Comparator function to sort files by date
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareTimestamp(FileInfo $a, FileInfo $b) {
-		$aTime = $a->getMTime();
-		$bTime = $b->getMTime();
-		return ($aTime < $bTime) ? -1 : 1;
-	}
+    /**
+     * Comparator function to sort files by date
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareTimestamp(FileInfo $a, FileInfo $b) {
+        $aTime = $a->getMTime();
+        $bTime = $b->getMTime();
+        return ($aTime < $bTime) ? -1 : 1;
+    }
 
-	/**
-	 * Comparator function to sort files by size
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareSize(FileInfo $a, FileInfo $b) {
-		$aSize = $a->getSize();
-		$bSize = $b->getSize();
-		return ($aSize < $bSize) ? -1 : 1;
-	}
+    /**
+     * Comparator function to sort files by size
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareSize(FileInfo $a, FileInfo $b) {
+        $aSize = $a->getSize();
+        $bSize = $b->getSize();
+        return ($aSize < $bSize) ? -1 : 1;
+    }
 
-	/**
-	 * Formats the file info to be returned as JSON to the client.
-	 *
-	 * @param \OCP\Files\FileInfo $i
-	 * @return array formatted file info
-	 */
-	public static function formatFileInfo(FileInfo $i) {
-		$entry = [];
+    /**
+     * Formats the file info to be returned as JSON to the client.
+     *
+     * @param \OCP\Files\FileInfo $i
+     * @return array formatted file info
+     */
+    public static function formatFileInfo(FileInfo $i) {
+        $entry = [];
 
-		$entry['id'] = $i['fileid'];
-		$entry['parentId'] = $i['parent'];
-		$entry['mtime'] = $i['mtime'] * 1000;
-		// only pick out the needed attributes
-		$entry['name'] = $i->getName();
-		$entry['permissions'] = $i['permissions'];
-		$entry['mimetype'] = $i['mimetype'];
-		$entry['size'] = $i['size'];
-		$entry['type'] = $i['type'];
-		$entry['etag'] = $i['etag'];
-		if (isset($i['tags'])) {
-			$entry['tags'] = $i['tags'];
-		}
-		if (isset($i['displayname_owner'])) {
-			$entry['shareOwner'] = $i['displayname_owner'];
-		}
-		if (isset($i['is_share_mount_point'])) {
-			$entry['isShareMountPoint'] = $i['is_share_mount_point'];
-		}
-		$mountType = null;
-		$mount = $i->getMountPoint();
-		$mountType = $mount->getMountType();
-		if ($mountType !== '') {
-			if ($i->getInternalPath() === '') {
-				$mountType .= '-root';
-			}
-			$entry['mountType'] = $mountType;
-		}
-		if (isset($i['extraData'])) {
-			$entry['extraData'] = $i['extraData'];
-		}
-		return $entry;
-	}
+        $entry['id'] = $i['fileid'];
+        $entry['parentId'] = $i['parent'];
+        $entry['mtime'] = $i['mtime'] * 1000;
+        // only pick out the needed attributes
+        $entry['name'] = $i->getName();
+        $entry['permissions'] = $i['permissions'];
+        $entry['mimetype'] = $i['mimetype'];
+        $entry['size'] = $i['size'];
+        $entry['type'] = $i['type'];
+        $entry['etag'] = $i['etag'];
+        if (isset($i['tags'])) {
+            $entry['tags'] = $i['tags'];
+        }
+        if (isset($i['displayname_owner'])) {
+            $entry['shareOwner'] = $i['displayname_owner'];
+        }
+        if (isset($i['is_share_mount_point'])) {
+            $entry['isShareMountPoint'] = $i['is_share_mount_point'];
+        }
+        $mountType = null;
+        $mount = $i->getMountPoint();
+        $mountType = $mount->getMountType();
+        if ($mountType !== '') {
+            if ($i->getInternalPath() === '') {
+                $mountType .= '-root';
+            }
+            $entry['mountType'] = $mountType;
+        }
+        if (isset($i['extraData'])) {
+            $entry['extraData'] = $i['extraData'];
+        }
+        return $entry;
+    }
 
-	/**
-	 * Format file info for JSON
-	 * @param \OCP\Files\FileInfo[] $fileInfos file infos
-	 * @return array
-	 */
-	public static function formatFileInfos($fileInfos) {
-		$files = [];
-		foreach ($fileInfos as $i) {
-			$files[] = self::formatFileInfo($i);
-		}
+    /**
+     * Format file info for JSON
+     * @param \OCP\Files\FileInfo[] $fileInfos file infos
+     * @return array
+     */
+    public static function formatFileInfos($fileInfos) {
+        $files = [];
+        foreach ($fileInfos as $i) {
+            $files[] = self::formatFileInfo($i);
+        }
 
-		return $files;
-	}
+        return $files;
+    }
 
-	/**
-	 * Retrieves the contents of the given directory and
-	 * returns it as a sorted array of FileInfo.
-	 *
-	 * @param string $dir path to the directory
-	 * @param string $sortAttribute attribute to sort on
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @param string $mimetypeFilter limit returned content to this mimetype or mimepart
-	 * @return \OCP\Files\FileInfo[] files
-	 */
-	public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false, $mimetypeFilter = '') {
-		$content = \OC\Files\Filesystem::getDirectoryContent($dir, $mimetypeFilter);
+    /**
+     * Retrieves the contents of the given directory and
+     * returns it as a sorted array of FileInfo.
+     *
+     * @param string $dir path to the directory
+     * @param string $sortAttribute attribute to sort on
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @param string $mimetypeFilter limit returned content to this mimetype or mimepart
+     * @return \OCP\Files\FileInfo[] files
+     */
+    public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false, $mimetypeFilter = '') {
+        $content = \OC\Files\Filesystem::getDirectoryContent($dir, $mimetypeFilter);
 
-		return self::sortFiles($content, $sortAttribute, $sortDescending);
-	}
+        return self::sortFiles($content, $sortAttribute, $sortDescending);
+    }
 
-	/**
-	 * Populate the result set with file tags
-	 *
-	 * @param array $fileList
-	 * @param string $fileIdentifier identifier attribute name for values in $fileList
-	 * @param ITagManager $tagManager
-	 * @return array file list populated with tags
-	 */
-	public static function populateTags(array $fileList, $fileIdentifier = 'fileid', ITagManager $tagManager) {
-		$ids = [];
-		foreach ($fileList as $fileData) {
-			$ids[] = $fileData[$fileIdentifier];
-		}
-		$tagger = $tagManager->load('files');
-		$tags = $tagger->getTagsForObjects($ids);
+    /**
+     * Populate the result set with file tags
+     *
+     * @param array $fileList
+     * @param string $fileIdentifier identifier attribute name for values in $fileList
+     * @param ITagManager $tagManager
+     * @return array file list populated with tags
+     */
+    public static function populateTags(array $fileList, $fileIdentifier = 'fileid', ITagManager $tagManager) {
+        $ids = [];
+        foreach ($fileList as $fileData) {
+            $ids[] = $fileData[$fileIdentifier];
+        }
+        $tagger = $tagManager->load('files');
+        $tags = $tagger->getTagsForObjects($ids);
 
-		if (!is_array($tags)) {
-			throw new \UnexpectedValueException('$tags must be an array');
-		}
+        if (!is_array($tags)) {
+            throw new \UnexpectedValueException('$tags must be an array');
+        }
 
-		// Set empty tag array
-		foreach ($fileList as $key => $fileData) {
-			$fileList[$key]['tags'] = [];
-		}
+        // Set empty tag array
+        foreach ($fileList as $key => $fileData) {
+            $fileList[$key]['tags'] = [];
+        }
 
-		if (!empty($tags)) {
-			foreach ($tags as $fileId => $fileTags) {
+        if (!empty($tags)) {
+            foreach ($tags as $fileId => $fileTags) {
 
-				foreach ($fileList as $key => $fileData) {
-					if ($fileId !== $fileData[$fileIdentifier]) {
-						continue;
-					}
+                foreach ($fileList as $key => $fileData) {
+                    if ($fileId !== $fileData[$fileIdentifier]) {
+                        continue;
+                    }
 
-					$fileList[$key]['tags'] = $fileTags;
-				}
-			}
-		}
+                    $fileList[$key]['tags'] = $fileTags;
+                }
+            }
+        }
 
-		return $fileList;
-	}
+        return $fileList;
+    }
 
-	/**
-	 * Sort the given file info array
-	 *
-	 * @param \OCP\Files\FileInfo[] $files files to sort
-	 * @param string $sortAttribute attribute to sort on
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @return \OCP\Files\FileInfo[] sorted files
-	 */
-	public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) {
-		$sortFunc = 'compareFileNames';
-		if ($sortAttribute === 'mtime') {
-			$sortFunc = 'compareTimestamp';
-		} else if ($sortAttribute === 'size') {
-			$sortFunc = 'compareSize';
-		}
-		usort($files, [Helper::class, $sortFunc]);
-		if ($sortDescending) {
-			$files = array_reverse($files);
-		}
-		return $files;
-	}
+    /**
+     * Sort the given file info array
+     *
+     * @param \OCP\Files\FileInfo[] $files files to sort
+     * @param string $sortAttribute attribute to sort on
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @return \OCP\Files\FileInfo[] sorted files
+     */
+    public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) {
+        $sortFunc = 'compareFileNames';
+        if ($sortAttribute === 'mtime') {
+            $sortFunc = 'compareTimestamp';
+        } else if ($sortAttribute === 'size') {
+            $sortFunc = 'compareSize';
+        }
+        usort($files, [Helper::class, $sortFunc]);
+        if ($sortDescending) {
+            $files = array_reverse($files);
+        }
+        return $files;
+    }
 }

apps/files/lib/Command/DeleteOrphanedFiles.php

Indentation +38 added lines, -38 removed lines

@@ -35,51 +35,51 @@
  */
 class DeleteOrphanedFiles extends Command {
 
-	const CHUNK_SIZE = 200;
+    const CHUNK_SIZE = 200;
 
-	/**
-	 * @var IDBConnection
-	 */
-	protected $connection;
+    /**
+     * @var IDBConnection
+     */
+    protected $connection;
 
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		parent::__construct();
-	}
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('files:cleanup')
-			->setDescription('cleanup filecache');
-	}
+    protected function configure() {
+        $this
+            ->setName('files:cleanup')
+            ->setDescription('cleanup filecache');
+    }
 
-	public function execute(InputInterface $input, OutputInterface $output) {
-		$deletedEntries = 0;
+    public function execute(InputInterface $input, OutputInterface $output) {
+        $deletedEntries = 0;
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('fc.fileid')
-			->from('filecache', 'fc')
-			->where($query->expr()->isNull('s.numeric_id'))
-			->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id'))
-			->setMaxResults(self::CHUNK_SIZE);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('fc.fileid')
+            ->from('filecache', 'fc')
+            ->where($query->expr()->isNull('s.numeric_id'))
+            ->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id'))
+            ->setMaxResults(self::CHUNK_SIZE);
 
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('filecache')
-			->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid')));
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('filecache')
+            ->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid')));
 
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->execute();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid'])
-					->execute();
-			}
-			$result->closeCursor();
-		}
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->execute();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid'])
+                    ->execute();
+            }
+            $result->closeCursor();
+        }
 
-		$output->writeln("$deletedEntries orphaned file cache entries deleted");
-	}
+        $output->writeln("$deletedEntries orphaned file cache entries deleted");
+    }
 
 }

apps/files/lib/BackgroundJob/CleanupFileLocks.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 */
 	public function run($argument) {
 		$lockingProvider = \OC::$server->getLockingProvider();
-		if($lockingProvider instanceof DBLockingProvider) {
+		if ($lockingProvider instanceof DBLockingProvider) {
 			$lockingProvider->cleanExpiredLocks();
 		}
 	}

Indentation +24 added lines, -24 removed lines

@@ -30,30 +30,30 @@
  */
 class CleanupFileLocks extends TimedJob {
 
-	/**
-	 * Default interval in minutes
-	 *
-	 * @var int $defaultIntervalMin
-	 **/
-	protected $defaultIntervalMin = 5;
+    /**
+     * Default interval in minutes
+     *
+     * @var int $defaultIntervalMin
+     **/
+    protected $defaultIntervalMin = 5;
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		$this->interval = $this->defaultIntervalMin * 60;
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        $this->interval = $this->defaultIntervalMin * 60;
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 * @throws \Exception
-	 */
-	public function run($argument) {
-		$lockingProvider = \OC::$server->getLockingProvider();
-		if($lockingProvider instanceof DBLockingProvider) {
-			$lockingProvider->cleanExpiredLocks();
-		}
-	}
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     * @throws \Exception
+     */
+    public function run($argument) {
+        $lockingProvider = \OC::$server->getLockingProvider();
+        if($lockingProvider instanceof DBLockingProvider) {
+            $lockingProvider->cleanExpiredLocks();
+        }
+    }
 }