Inspection of "allow sharees to edit certain calendar properties..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#3620)

by Georg

created 2017-03-01 13:02 UTC

Status

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

@@ -27,72 +27,72 @@
 block discarded – undo
 
 class FileDeleted 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_deleted';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'file_deleted';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A new file or folder has been <strong>deleted</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>deleted</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 3;
-	}
+    /**
+     * @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 3;
+    }
 
-	/**
-	 * @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;
+    }
 }
 

Please login to merge, or discard this patch.

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

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

@@ -27,72 +27,72 @@
 block discarded – undo
 
 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;
+    }
 }
 

Please login to merge, or discard this patch.

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

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

@@ -27,72 +27,72 @@
 block discarded – undo
 
 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;
+    }
 }
 

Please login to merge, or discard this patch.

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

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

@@ -27,72 +27,72 @@
 block discarded – undo
 
 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;
+    }
 }
 

Please login to merge, or discard this patch.

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

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

@@ -27,72 +27,72 @@
 block discarded – undo
 
 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;
+    }
 }
 

Please login to merge, or discard this patch.

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

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

@@ -27,72 +27,72 @@
 block discarded – undo
 
 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;
+    }
 }
 

Please login to merge, or discard this patch.

apps/files/lib/Service/TagService.php 1 patch

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

@@ -38,99 +38,99 @@
 block discarded – undo
  */
 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) {
+        }
+    }
 }
 

Please login to merge, or discard this patch.

apps/files/lib/App.php 1 patch

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

@@ -27,22 +27,22 @@
 block discarded – undo
 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;
+    }
 
 }

Please login to merge, or discard this patch.

apps/files/lib/Controller/SettingsController.php 1 patch

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

@@ -29,23 +29,23 @@
 block discarded – undo
 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)
+            ]);
+        }
+    }
 }

Please login to merge, or discard this patch.

		@@ -27,72 +27,72 @@
		block discarded – undo
27	27
28	28	class FileDeleted implements ISetting {
29	29
30		- /** @var IL10N */
31		- protected $l;
	30	+ /** @var IL10N */
	31	+ protected $l;
32	32
33		- /**
34		- * @param IL10N $l
35		- */
36		- public function __construct(IL10N $l) {
37		- $this->l = $l;
38		- }
	33	+ /**
	34	+ * @param IL10N $l
	35	+ */
	36	+ public function __construct(IL10N $l) {
	37	+ $this->l = $l;
	38	+ }
39	39
40		- /**
41		- * @return string Lowercase a-z and underscore only identifier
42		- * @since 11.0.0
43		- */
44		- public function getIdentifier() {
45		- return 'file_deleted';
46		- }
	40	+ /**
	41	+ * @return string Lowercase a-z and underscore only identifier
	42	+ * @since 11.0.0
	43	+ */
	44	+ public function getIdentifier() {
	45	+ return 'file_deleted';
	46	+ }
47	47
48		- /**
49		- * @return string A translated string
50		- * @since 11.0.0
51		- */
52		- public function getName() {
53		- return $this->l->t('A new file or folder has been <strong>deleted</strong>');
54		- }
	48	+ /**
	49	+ * @return string A translated string
	50	+ * @since 11.0.0
	51	+ */
	52	+ public function getName() {
	53	+ return $this->l->t('A new file or folder has been <strong>deleted</strong>');
	54	+ }
55	55
56		- /**
57		- * @return int whether the filter should be rather on the top or bottom of
58		- * the admin section. The filters are arranged in ascending order of the
59		- * priority values. It is required to return a value between 0 and 100.
60		- * @since 11.0.0
61		- */
62		- public function getPriority() {
63		- return 3;
64		- }
	56	+ /**
	57	+ * @return int whether the filter should be rather on the top or bottom of
	58	+ * the admin section. The filters are arranged in ascending order of the
	59	+ * priority values. It is required to return a value between 0 and 100.
	60	+ * @since 11.0.0
	61	+ */
	62	+ public function getPriority() {
	63	+ return 3;
	64	+ }
65	65
66		- /**
67		- * @return bool True when the option can be changed for the stream
68		- * @since 11.0.0
69		- */
70		- public function canChangeStream() {
71		- return true;
72		- }
	66	+ /**
	67	+ * @return bool True when the option can be changed for the stream
	68	+ * @since 11.0.0
	69	+ */
	70	+ public function canChangeStream() {
	71	+ return true;
	72	+ }
73	73
74		- /**
75		- * @return bool True when the option can be changed for the stream
76		- * @since 11.0.0
77		- */
78		- public function isDefaultEnabledStream() {
79		- return true;
80		- }
	74	+ /**
	75	+ * @return bool True when the option can be changed for the stream
	76	+ * @since 11.0.0
	77	+ */
	78	+ public function isDefaultEnabledStream() {
	79	+ return true;
	80	+ }
81	81
82		- /**
83		- * @return bool True when the option can be changed for the mail
84		- * @since 11.0.0
85		- */
86		- public function canChangeMail() {
87		- return true;
88		- }
	82	+ /**
	83	+ * @return bool True when the option can be changed for the mail
	84	+ * @since 11.0.0
	85	+ */
	86	+ public function canChangeMail() {
	87	+ return true;
	88	+ }
89	89
90		- /**
91		- * @return bool True when the option can be changed for the stream
92		- * @since 11.0.0
93		- */
94		- public function isDefaultEnabledMail() {
95		- return false;
96		- }
	90	+ /**
	91	+ * @return bool True when the option can be changed for the stream
	92	+ * @since 11.0.0
	93	+ */
	94	+ public function isDefaultEnabledMail() {
	95	+ return false;
	96	+ }
97	97	}
98	98

		@@ -27,72 +27,72 @@
		block discarded – undo
27	27
28	28	class FileChanged implements ISetting {
29	29
30		- /** @var IL10N */
31		- protected $l;
	30	+ /** @var IL10N */
	31	+ protected $l;
32	32
33		- /**
34		- * @param IL10N $l
35		- */
36		- public function __construct(IL10N $l) {
37		- $this->l = $l;
38		- }
	33	+ /**
	34	+ * @param IL10N $l
	35	+ */
	36	+ public function __construct(IL10N $l) {
	37	+ $this->l = $l;
	38	+ }
39	39
40		- /**
41		- * @return string Lowercase a-z and underscore only identifier
42		- * @since 11.0.0
43		- */
44		- public function getIdentifier() {
45		- return 'file_changed';
46		- }
	40	+ /**
	41	+ * @return string Lowercase a-z and underscore only identifier
	42	+ * @since 11.0.0
	43	+ */
	44	+ public function getIdentifier() {
	45	+ return 'file_changed';
	46	+ }
47	47
48		- /**
49		- * @return string A translated string
50		- * @since 11.0.0
51		- */
52		- public function getName() {
53		- return $this->l->t('A file or folder has been <strong>changed</strong> or <strong>renamed</strong>');
54		- }
	48	+ /**
	49	+ * @return string A translated string
	50	+ * @since 11.0.0
	51	+ */
	52	+ public function getName() {
	53	+ return $this->l->t('A file or folder has been <strong>changed</strong> or <strong>renamed</strong>');
	54	+ }
55	55
56		- /**
57		- * @return int whether the filter should be rather on the top or bottom of
58		- * the admin section. The filters are arranged in ascending order of the
59		- * priority values. It is required to return a value between 0 and 100.
60		- * @since 11.0.0
61		- */
62		- public function getPriority() {
63		- return 1;
64		- }
	56	+ /**
	57	+ * @return int whether the filter should be rather on the top or bottom of
	58	+ * the admin section. The filters are arranged in ascending order of the
	59	+ * priority values. It is required to return a value between 0 and 100.
	60	+ * @since 11.0.0
	61	+ */
	62	+ public function getPriority() {
	63	+ return 1;
	64	+ }
65	65
66		- /**
67		- * @return bool True when the option can be changed for the stream
68		- * @since 11.0.0
69		- */
70		- public function canChangeStream() {
71		- return true;
72		- }
	66	+ /**
	67	+ * @return bool True when the option can be changed for the stream
	68	+ * @since 11.0.0
	69	+ */
	70	+ public function canChangeStream() {
	71	+ return true;
	72	+ }
73	73
74		- /**
75		- * @return bool True when the option can be changed for the stream
76		- * @since 11.0.0
77		- */
78		- public function isDefaultEnabledStream() {
79		- return true;
80		- }
	74	+ /**
	75	+ * @return bool True when the option can be changed for the stream
	76	+ * @since 11.0.0
	77	+ */
	78	+ public function isDefaultEnabledStream() {
	79	+ return true;
	80	+ }
81	81
82		- /**
83		- * @return bool True when the option can be changed for the mail
84		- * @since 11.0.0
85		- */
86		- public function canChangeMail() {
87		- return true;
88		- }
	82	+ /**
	83	+ * @return bool True when the option can be changed for the mail
	84	+ * @since 11.0.0
	85	+ */
	86	+ public function canChangeMail() {
	87	+ return true;
	88	+ }
89	89
90		- /**
91		- * @return bool True when the option can be changed for the stream
92		- * @since 11.0.0
93		- */
94		- public function isDefaultEnabledMail() {
95		- return false;
96		- }
	90	+ /**
	91	+ * @return bool True when the option can be changed for the stream
	92	+ * @since 11.0.0
	93	+ */
	94	+ public function isDefaultEnabledMail() {
	95	+ return false;
	96	+ }
97	97	}
98	98

		@@ -27,72 +27,72 @@
		block discarded – undo
27	27
28	28	class FileRestored implements ISetting {
29	29
30		- /** @var IL10N */
31		- protected $l;
	30	+ /** @var IL10N */
	31	+ protected $l;
32	32
33		- /**
34		- * @param IL10N $l
35		- */
36		- public function __construct(IL10N $l) {
37		- $this->l = $l;
38		- }
	33	+ /**
	34	+ * @param IL10N $l
	35	+ */
	36	+ public function __construct(IL10N $l) {
	37	+ $this->l = $l;
	38	+ }
39	39
40		- /**
41		- * @return string Lowercase a-z and underscore only identifier
42		- * @since 11.0.0
43		- */
44		- public function getIdentifier() {
45		- return 'file_restored';
46		- }
	40	+ /**
	41	+ * @return string Lowercase a-z and underscore only identifier
	42	+ * @since 11.0.0
	43	+ */
	44	+ public function getIdentifier() {
	45	+ return 'file_restored';
	46	+ }
47	47
48		- /**
49		- * @return string A translated string
50		- * @since 11.0.0
51		- */
52		- public function getName() {
53		- return $this->l->t('A new file or folder has been <strong>restored</strong>');
54		- }
	48	+ /**
	49	+ * @return string A translated string
	50	+ * @since 11.0.0
	51	+ */
	52	+ public function getName() {
	53	+ return $this->l->t('A new file or folder has been <strong>restored</strong>');
	54	+ }
55	55
56		- /**
57		- * @return int whether the filter should be rather on the top or bottom of
58		- * the admin section. The filters are arranged in ascending order of the
59		- * priority values. It is required to return a value between 0 and 100.
60		- * @since 11.0.0
61		- */
62		- public function getPriority() {
63		- return 4;
64		- }
	56	+ /**
	57	+ * @return int whether the filter should be rather on the top or bottom of
	58	+ * the admin section. The filters are arranged in ascending order of the
	59	+ * priority values. It is required to return a value between 0 and 100.
	60	+ * @since 11.0.0
	61	+ */
	62	+ public function getPriority() {
	63	+ return 4;
	64	+ }
65	65
66		- /**
67		- * @return bool True when the option can be changed for the stream
68		- * @since 11.0.0
69		- */
70		- public function canChangeStream() {
71		- return true;
72		- }
	66	+ /**
	67	+ * @return bool True when the option can be changed for the stream
	68	+ * @since 11.0.0
	69	+ */
	70	+ public function canChangeStream() {
	71	+ return true;
	72	+ }
73	73
74		- /**
75		- * @return bool True when the option can be changed for the stream
76		- * @since 11.0.0
77		- */
78		- public function isDefaultEnabledStream() {
79		- return true;
80		- }
	74	+ /**
	75	+ * @return bool True when the option can be changed for the stream
	76	+ * @since 11.0.0
	77	+ */
	78	+ public function isDefaultEnabledStream() {
	79	+ return true;
	80	+ }
81	81
82		- /**
83		- * @return bool True when the option can be changed for the mail
84		- * @since 11.0.0
85		- */
86		- public function canChangeMail() {
87		- return true;
88		- }
	82	+ /**
	83	+ * @return bool True when the option can be changed for the mail
	84	+ * @since 11.0.0
	85	+ */
	86	+ public function canChangeMail() {
	87	+ return true;
	88	+ }
89	89
90		- /**
91		- * @return bool True when the option can be changed for the stream
92		- * @since 11.0.0
93		- */
94		- public function isDefaultEnabledMail() {
95		- return false;
96		- }
	90	+ /**
	91	+ * @return bool True when the option can be changed for the stream
	92	+ * @since 11.0.0
	93	+ */
	94	+ public function isDefaultEnabledMail() {
	95	+ return false;
	96	+ }
97	97	}
98	98

		@@ -27,72 +27,72 @@
		block discarded – undo
27	27
28	28	class FileCreated implements ISetting {
29	29
30		- /** @var IL10N */
31		- protected $l;
	30	+ /** @var IL10N */
	31	+ protected $l;
32	32
33		- /**
34		- * @param IL10N $l
35		- */
36		- public function __construct(IL10N $l) {
37		- $this->l = $l;
38		- }
	33	+ /**
	34	+ * @param IL10N $l
	35	+ */
	36	+ public function __construct(IL10N $l) {
	37	+ $this->l = $l;
	38	+ }
39	39
40		- /**
41		- * @return string Lowercase a-z and underscore only identifier
42		- * @since 11.0.0
43		- */
44		- public function getIdentifier() {
45		- return 'file_created';
46		- }
	40	+ /**
	41	+ * @return string Lowercase a-z and underscore only identifier
	42	+ * @since 11.0.0
	43	+ */
	44	+ public function getIdentifier() {
	45	+ return 'file_created';
	46	+ }
47	47
48		- /**
49		- * @return string A translated string
50		- * @since 11.0.0
51		- */
52		- public function getName() {
53		- return $this->l->t('A new file or folder has been <strong>created</strong>');
54		- }
	48	+ /**
	49	+ * @return string A translated string
	50	+ * @since 11.0.0
	51	+ */
	52	+ public function getName() {
	53	+ return $this->l->t('A new file or folder has been <strong>created</strong>');
	54	+ }
55	55
56		- /**
57		- * @return int whether the filter should be rather on the top or bottom of
58		- * the admin section. The filters are arranged in ascending order of the
59		- * priority values. It is required to return a value between 0 and 100.
60		- * @since 11.0.0
61		- */
62		- public function getPriority() {
63		- return 0;
64		- }
	56	+ /**
	57	+ * @return int whether the filter should be rather on the top or bottom of
	58	+ * the admin section. The filters are arranged in ascending order of the
	59	+ * priority values. It is required to return a value between 0 and 100.
	60	+ * @since 11.0.0
	61	+ */
	62	+ public function getPriority() {
	63	+ return 0;
	64	+ }
65	65
66		- /**
67		- * @return bool True when the option can be changed for the stream
68		- * @since 11.0.0
69		- */
70		- public function canChangeStream() {
71		- return true;
72		- }
	66	+ /**
	67	+ * @return bool True when the option can be changed for the stream
	68	+ * @since 11.0.0
	69	+ */
	70	+ public function canChangeStream() {
	71	+ return true;
	72	+ }
73	73
74		- /**
75		- * @return bool True when the option can be changed for the stream
76		- * @since 11.0.0
77		- */
78		- public function isDefaultEnabledStream() {
79		- return true;
80		- }
	74	+ /**
	75	+ * @return bool True when the option can be changed for the stream
	76	+ * @since 11.0.0
	77	+ */
	78	+ public function isDefaultEnabledStream() {
	79	+ return true;
	80	+ }
81	81
82		- /**
83		- * @return bool True when the option can be changed for the mail
84		- * @since 11.0.0
85		- */
86		- public function canChangeMail() {
87		- return true;
88		- }
	82	+ /**
	83	+ * @return bool True when the option can be changed for the mail
	84	+ * @since 11.0.0
	85	+ */
	86	+ public function canChangeMail() {
	87	+ return true;
	88	+ }
89	89
90		- /**
91		- * @return bool True when the option can be changed for the stream
92		- * @since 11.0.0
93		- */
94		- public function isDefaultEnabledMail() {
95		- return false;
96		- }
	90	+ /**
	91	+ * @return bool True when the option can be changed for the stream
	92	+ * @since 11.0.0
	93	+ */
	94	+ public function isDefaultEnabledMail() {
	95	+ return false;
	96	+ }
97	97	}
98	98

		@@ -27,72 +27,72 @@
		block discarded – undo
27	27
28	28	class FavoriteAction implements ISetting {
29	29
30		- /** @var IL10N */
31		- protected $l;
	30	+ /** @var IL10N */
	31	+ protected $l;
32	32
33		- /**
34		- * @param IL10N $l
35		- */
36		- public function __construct(IL10N $l) {
37		- $this->l = $l;
38		- }
	33	+ /**
	34	+ * @param IL10N $l
	35	+ */
	36	+ public function __construct(IL10N $l) {
	37	+ $this->l = $l;
	38	+ }
39	39
40		- /**
41		- * @return string Lowercase a-z and underscore only identifier
42		- * @since 11.0.0
43		- */
44		- public function getIdentifier() {
45		- return 'favorite';
46		- }
	40	+ /**
	41	+ * @return string Lowercase a-z and underscore only identifier
	42	+ * @since 11.0.0
	43	+ */
	44	+ public function getIdentifier() {
	45	+ return 'favorite';
	46	+ }
47	47
48		- /**
49		- * @return string A translated string
50		- * @since 11.0.0
51		- */
52		- public function getName() {
53		- return $this->l->t('A file has been added to or removed from your <strong>favorites</strong>');
54		- }
	48	+ /**
	49	+ * @return string A translated string
	50	+ * @since 11.0.0
	51	+ */
	52	+ public function getName() {
	53	+ return $this->l->t('A file has been added to or removed from your <strong>favorites</strong>');
	54	+ }
55	55
56		- /**
57		- * @return int whether the filter should be rather on the top or bottom of
58		- * the admin section. The filters are arranged in ascending order of the
59		- * priority values. It is required to return a value between 0 and 100.
60		- * @since 11.0.0
61		- */
62		- public function getPriority() {
63		- return 5;
64		- }
	56	+ /**
	57	+ * @return int whether the filter should be rather on the top or bottom of
	58	+ * the admin section. The filters are arranged in ascending order of the
	59	+ * priority values. It is required to return a value between 0 and 100.
	60	+ * @since 11.0.0
	61	+ */
	62	+ public function getPriority() {
	63	+ return 5;
	64	+ }
65	65
66		- /**
67		- * @return bool True when the option can be changed for the stream
68		- * @since 11.0.0
69		- */
70		- public function canChangeStream() {
71		- return true;
72		- }
	66	+ /**
	67	+ * @return bool True when the option can be changed for the stream
	68	+ * @since 11.0.0
	69	+ */
	70	+ public function canChangeStream() {
	71	+ return true;
	72	+ }
73	73
74		- /**
75		- * @return bool True when the option can be changed for the stream
76		- * @since 11.0.0
77		- */
78		- public function isDefaultEnabledStream() {
79		- return true;
80		- }
	74	+ /**
	75	+ * @return bool True when the option can be changed for the stream
	76	+ * @since 11.0.0
	77	+ */
	78	+ public function isDefaultEnabledStream() {
	79	+ return true;
	80	+ }
81	81
82		- /**
83		- * @return bool True when the option can be changed for the mail
84		- * @since 11.0.0
85		- */
86		- public function canChangeMail() {
87		- return true;
88		- }
	82	+ /**
	83	+ * @return bool True when the option can be changed for the mail
	84	+ * @since 11.0.0
	85	+ */
	86	+ public function canChangeMail() {
	87	+ return true;
	88	+ }
89	89
90		- /**
91		- * @return bool True when the option can be changed for the stream
92		- * @since 11.0.0
93		- */
94		- public function isDefaultEnabledMail() {
95		- return false;
96		- }
	90	+ /**
	91	+ * @return bool True when the option can be changed for the stream
	92	+ * @since 11.0.0
	93	+ */
	94	+ public function isDefaultEnabledMail() {
	95	+ return false;
	96	+ }
97	97	}
98	98

		@@ -27,72 +27,72 @@
		block discarded – undo
27	27
28	28	class FileFavorite implements ISetting {
29	29
30		- /** @var IL10N */
31		- protected $l;
	30	+ /** @var IL10N */
	31	+ protected $l;
32	32
33		- /**
34		- * @param IL10N $l
35		- */
36		- public function __construct(IL10N $l) {
37		- $this->l = $l;
38		- }
	33	+ /**
	34	+ * @param IL10N $l
	35	+ */
	36	+ public function __construct(IL10N $l) {
	37	+ $this->l = $l;
	38	+ }
39	39
40		- /**
41		- * @return string Lowercase a-z and underscore only identifier
42		- * @since 11.0.0
43		- */
44		- public function getIdentifier() {
45		- return 'file_favorite';
46		- }
	40	+ /**
	41	+ * @return string Lowercase a-z and underscore only identifier
	42	+ * @since 11.0.0
	43	+ */
	44	+ public function getIdentifier() {
	45	+ return 'file_favorite';
	46	+ }
47	47
48		- /**
49		- * @return string A translated string
50		- * @since 11.0.0
51		- */
52		- public function getName() {
53		- return $this->l->t('Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>');
54		- }
	48	+ /**
	49	+ * @return string A translated string
	50	+ * @since 11.0.0
	51	+ */
	52	+ public function getName() {
	53	+ return $this->l->t('Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>');
	54	+ }
55	55
56		- /**
57		- * @return int whether the filter should be rather on the top or bottom of
58		- * the admin section. The filters are arranged in ascending order of the
59		- * priority values. It is required to return a value between 0 and 100.
60		- * @since 11.0.0
61		- */
62		- public function getPriority() {
63		- return 2;
64		- }
	56	+ /**
	57	+ * @return int whether the filter should be rather on the top or bottom of
	58	+ * the admin section. The filters are arranged in ascending order of the
	59	+ * priority values. It is required to return a value between 0 and 100.
	60	+ * @since 11.0.0
	61	+ */
	62	+ public function getPriority() {
	63	+ return 2;
	64	+ }
65	65
66		- /**
67		- * @return bool True when the option can be changed for the stream
68		- * @since 11.0.0
69		- */
70		- public function canChangeStream() {
71		- return true;
72		- }
	66	+ /**
	67	+ * @return bool True when the option can be changed for the stream
	68	+ * @since 11.0.0
	69	+ */
	70	+ public function canChangeStream() {
	71	+ return true;
	72	+ }
73	73
74		- /**
75		- * @return bool True when the option can be changed for the stream
76		- * @since 11.0.0
77		- */
78		- public function isDefaultEnabledStream() {
79		- return false;
80		- }
	74	+ /**
	75	+ * @return bool True when the option can be changed for the stream
	76	+ * @since 11.0.0
	77	+ */
	78	+ public function isDefaultEnabledStream() {
	79	+ return false;
	80	+ }
81	81
82		- /**
83		- * @return bool True when the option can be changed for the mail
84		- * @since 11.0.0
85		- */
86		- public function canChangeMail() {
87		- return false;
88		- }
	82	+ /**
	83	+ * @return bool True when the option can be changed for the mail
	84	+ * @since 11.0.0
	85	+ */
	86	+ public function canChangeMail() {
	87	+ return false;
	88	+ }
89	89
90		- /**
91		- * @return bool True when the option can be changed for the stream
92		- * @since 11.0.0
93		- */
94		- public function isDefaultEnabledMail() {
95		- return false;
96		- }
	90	+ /**
	91	+ * @return bool True when the option can be changed for the stream
	92	+ * @since 11.0.0
	93	+ */
	94	+ public function isDefaultEnabledMail() {
	95	+ return false;
	96	+ }
97	97	}
98	98

		@@ -38,99 +38,99 @@
		block discarded – undo
38	38	*/
39	39	class TagService {
40	40
41		- /** @var IUserSession */
42		- private $userSession;
43		- /** @var IManager */
44		- private $activityManager;
45		- /** @var ITags */
46		- private $tagger;
47		- /** @var Folder */
48		- private $homeFolder;
	41	+ /** @var IUserSession */
	42	+ private $userSession;
	43	+ /** @var IManager */
	44	+ private $activityManager;
	45	+ /** @var ITags */
	46	+ private $tagger;
	47	+ /** @var Folder */
	48	+ private $homeFolder;
49	49
50		- /**
51		- * @param IUserSession $userSession
52		- * @param IManager $activityManager
53		- * @param ITags $tagger
54		- * @param Folder $homeFolder
55		- */
56		- public function __construct(
57		- IUserSession $userSession,
58		- IManager $activityManager,
59		- ITags $tagger,
60		- Folder $homeFolder
61		- ) {
62		- $this->userSession = $userSession;
63		- $this->activityManager = $activityManager;
64		- $this->tagger = $tagger;
65		- $this->homeFolder = $homeFolder;
66		- }
	50	+ /**
	51	+ * @param IUserSession $userSession
	52	+ * @param IManager $activityManager
	53	+ * @param ITags $tagger
	54	+ * @param Folder $homeFolder
	55	+ */
	56	+ public function __construct(
	57	+ IUserSession $userSession,
	58	+ IManager $activityManager,
	59	+ ITags $tagger,
	60	+ Folder $homeFolder
	61	+ ) {
	62	+ $this->userSession = $userSession;
	63	+ $this->activityManager = $activityManager;
	64	+ $this->tagger = $tagger;
	65	+ $this->homeFolder = $homeFolder;
	66	+ }
67	67
68		- /**
69		- * Updates the tags of the specified file path.
70		- * The passed tags are absolute, which means they will
71		- * replace the actual tag selection.
72		- *
73		- * @param string $path path
74		- * @param array $tags array of tags
75		- * @return array list of tags
76		- * @throws \OCP\Files\NotFoundException if the file does not exist
77		- */
78		- public function updateFileTags($path, $tags) {
79		- $fileId = $this->homeFolder->get($path)->getId();
	68	+ /**
	69	+ * Updates the tags of the specified file path.
	70	+ * The passed tags are absolute, which means they will
	71	+ * replace the actual tag selection.
	72	+ *
	73	+ * @param string $path path
	74	+ * @param array $tags array of tags
	75	+ * @return array list of tags
	76	+ * @throws \OCP\Files\NotFoundException if the file does not exist
	77	+ */
	78	+ public function updateFileTags($path, $tags) {
	79	+ $fileId = $this->homeFolder->get($path)->getId();
80	80
81		- $currentTags = $this->tagger->getTagsForObjects(array($fileId));
	81	+ $currentTags = $this->tagger->getTagsForObjects(array($fileId));
82	82
83		- if (!empty($currentTags)) {
84		- $currentTags = current($currentTags);
85		- }
	83	+ if (!empty($currentTags)) {
	84	+ $currentTags = current($currentTags);
	85	+ }
86	86
87		- $newTags = array_diff($tags, $currentTags);
88		- foreach ($newTags as $tag) {
89		- if ($tag === Tags::TAG_FAVORITE) {
90		- $this->addActivity(true, $fileId, $path);
91		- }
92		- $this->tagger->tagAs($fileId, $tag);
93		- }
94		- $deletedTags = array_diff($currentTags, $tags);
95		- foreach ($deletedTags as $tag) {
96		- if ($tag === Tags::TAG_FAVORITE) {
97		- $this->addActivity(false, $fileId, $path);
98		- }
99		- $this->tagger->unTag($fileId, $tag);
100		- }
	87	+ $newTags = array_diff($tags, $currentTags);
	88	+ foreach ($newTags as $tag) {
	89	+ if ($tag === Tags::TAG_FAVORITE) {
	90	+ $this->addActivity(true, $fileId, $path);
	91	+ }
	92	+ $this->tagger->tagAs($fileId, $tag);
	93	+ }
	94	+ $deletedTags = array_diff($currentTags, $tags);
	95	+ foreach ($deletedTags as $tag) {
	96	+ if ($tag === Tags::TAG_FAVORITE) {
	97	+ $this->addActivity(false, $fileId, $path);
	98	+ }
	99	+ $this->tagger->unTag($fileId, $tag);
	100	+ }
101	101
102		- // TODO: re-read from tagger to make sure the
103		- // list is up to date, in case of concurrent changes ?
104		- return $tags;
105		- }
	102	+ // TODO: re-read from tagger to make sure the
	103	+ // list is up to date, in case of concurrent changes ?
	104	+ return $tags;
	105	+ }
106	106
107		- /**
108		- * @param bool $addToFavorite
109		- * @param int $fileId
110		- * @param string $path
111		- */
112		- protected function addActivity($addToFavorite, $fileId, $path) {
113		- $user = $this->userSession->getUser();
114		- if (!$user instanceof IUser) {
115		- return;
116		- }
	107	+ /**
	108	+ * @param bool $addToFavorite
	109	+ * @param int $fileId
	110	+ * @param string $path
	111	+ */
	112	+ protected function addActivity($addToFavorite, $fileId, $path) {
	113	+ $user = $this->userSession->getUser();
	114	+ if (!$user instanceof IUser) {
	115	+ return;
	116	+ }
117	117
118		- $event = $this->activityManager->generateEvent();
119		- try {
120		- $event->setApp('files')
121		- ->setObject('files', $fileId, $path)
122		- ->setType('favorite')
123		- ->setAuthor($user->getUID())
124		- ->setAffectedUser($user->getUID())
125		- ->setTimestamp(time())
126		- ->setSubject(
127		- $addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
128		- ['id' => $fileId, 'path' => $path]
129		- );
130		- $this->activityManager->publish($event);
131		- } catch (\InvalidArgumentException $e) {
132		- } catch (\BadMethodCallException $e) {
133		- }
134		- }
	118	+ $event = $this->activityManager->generateEvent();
	119	+ try {
	120	+ $event->setApp('files')
	121	+ ->setObject('files', $fileId, $path)
	122	+ ->setType('favorite')
	123	+ ->setAuthor($user->getUID())
	124	+ ->setAffectedUser($user->getUID())
	125	+ ->setTimestamp(time())
	126	+ ->setSubject(
	127	+ $addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
	128	+ ['id' => $fileId, 'path' => $path]
	129	+ );
	130	+ $this->activityManager->publish($event);
	131	+ } catch (\InvalidArgumentException $e) {
	132	+ } catch (\BadMethodCallException $e) {
	133	+ }
	134	+ }
135	135	}
136	136

		@@ -27,22 +27,22 @@
		block discarded – undo
27	27	namespace OCA\Files;
28	28
29	29	class App {
30		- /**
31		- * @var \OCP\INavigationManager
32		- */
33		- private static $navigationManager;
	30	+ /**
	31	+ * @var \OCP\INavigationManager
	32	+ */
	33	+ private static $navigationManager;
34	34
35		- /**
36		- * Returns the app's navigation manager
37		- *
38		- * @return \OCP\INavigationManager
39		- */
40		- public static function getNavigationManager() {
41		- // TODO: move this into a service in the Application class
42		- if (self::$navigationManager === null) {
43		- self::$navigationManager = new \OC\NavigationManager();
44		- }
45		- return self::$navigationManager;
46		- }
	35	+ /**
	36	+ * Returns the app's navigation manager
	37	+ *
	38	+ * @return \OCP\INavigationManager
	39	+ */
	40	+ public static function getNavigationManager() {
	41	+ // TODO: move this into a service in the Application class
	42	+ if (self::$navigationManager === null) {
	43	+ self::$navigationManager = new \OC\NavigationManager();
	44	+ }
	45	+ return self::$navigationManager;
	46	+ }
47	47
48	48	}

		@@ -29,23 +29,23 @@
		block discarded – undo
29	29	use OCP\Util;
30	30
31	31	class SettingsController extends Controller {
32		- public function __construct($appName, IRequest $request) {
33		- parent::__construct($appName, $request);
34		- }
	32	+ public function __construct($appName, IRequest $request) {
	33	+ parent::__construct($appName, $request);
	34	+ }
35	35
36		- /**
37		- * @param string $maxUploadSize
38		- * @return JSONResponse
39		- */
40		- public function setMaxUploadSize($maxUploadSize) {
41		- $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize));
	36	+ /**
	37	+ * @param string $maxUploadSize
	38	+ * @return JSONResponse
	39	+ */
	40	+ public function setMaxUploadSize($maxUploadSize) {
	41	+ $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize));
42	42
43		- if ($setMaxSize === false) {
44		- return new JSONResponse([], Http::STATUS_BAD_REQUEST);
45		- } else {
46		- return new JSONResponse([
47		- 'maxUploadSize' => Util::humanFileSize($setMaxSize)
48		- ]);
49		- }
50		- }
	43	+ if ($setMaxSize === false) {
	44	+ return new JSONResponse([], Http::STATUS_BAD_REQUEST);
	45	+ } else {
	46	+ return new JSONResponse([
	47	+ 'maxUploadSize' => Util::humanFileSize($setMaxSize)
	48	+ ]);
	49	+ }
	50	+ }
51	51	}

nextcloud / server

Pull Request — master (#3620)

Status

Category

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

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

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

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

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

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

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

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

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