Inspection of "Use more verbose text for upload menu" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#4922)

by Jan-Christoph

created 2017-05-17 14:22 UTC

Status

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

@@ -25,97 +25,97 @@
 block discarded – undo
 
 class PublicLinks extends Base {
 
-	const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
-	const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
-	const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self';
-	const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by';
-	const SUBJECT_LINK_EXPIRED = 'link_expired';
-	const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired';
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
-			$subject = $this->l->t('Shared as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
-			$subject = $this->l->t('Removed public link');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
-			$subject = $this->l->t('Public link expired');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} shared as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} removed public link');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
-			$subject = $this->l->t('Public link of {actor} expired');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
-			$subject = $this->l->t('You shared {file} as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
-			$subject = $this->l->t('You removed public link for {file}');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
-			$subject = $this->l->t('Public link expired for {file}');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} shared {file} as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} removed public link for {file}');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
-			$subject = $this->l->t('Public link of {actor} for {file} expired');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_SHARED_LINK_SELF:
-			case self::SUBJECT_UNSHARED_LINK_SELF:
-			case self::SUBJECT_LINK_EXPIRED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-				];
-			case self::SUBJECT_RESHARED_LINK_BY:
-			case self::SUBJECT_UNSHARED_LINK_BY:
-			case self::SUBJECT_LINK_BY_EXPIRED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'actor' => $this->getUser($parameters[1]),
-				];
-		}
-		return [];
-	}
+    const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
+    const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
+    const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self';
+    const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by';
+    const SUBJECT_LINK_EXPIRED = 'link_expired';
+    const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired';
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
+            $subject = $this->l->t('Shared as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
+            $subject = $this->l->t('Removed public link');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
+            $subject = $this->l->t('Public link expired');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} shared as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} removed public link');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
+            $subject = $this->l->t('Public link of {actor} expired');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
+            $subject = $this->l->t('You shared {file} as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
+            $subject = $this->l->t('You removed public link for {file}');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
+            $subject = $this->l->t('Public link expired for {file}');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} shared {file} as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} removed public link for {file}');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
+            $subject = $this->l->t('Public link of {actor} for {file} expired');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_SHARED_LINK_SELF:
+            case self::SUBJECT_UNSHARED_LINK_SELF:
+            case self::SUBJECT_LINK_EXPIRED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                ];
+            case self::SUBJECT_RESHARED_LINK_BY:
+            case self::SUBJECT_UNSHARED_LINK_BY:
+            case self::SUBJECT_LINK_BY_EXPIRED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'actor' => $this->getUser($parameters[1]),
+                ];
+        }
+        return [];
+    }
 
 }

Please login to merge, or discard this patch.

apps/files_sharing/lib/Activity/Providers/RemoteShares.php 1 patch

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

@@ -32,116 +32,116 @@
 block discarded – undo
 
 class RemoteShares extends Base {
 
-	protected $cloudIdManager;
-
-	const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted';
-	const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined';
-	const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received';
-	const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared';
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(IFactory $languageFactory,
-								IURLGenerator $url,
-								IManager $activityManager,
-								IUserManager $userManager,
-								ICloudIdManager $cloudIdManager
-	) {
-		parent::__construct($languageFactory, $url, $activityManager, $userManager);
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
-			$subject = $this->l->t('{user} accepted the remote share');
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
-			$subject = $this->l->t('{user} declined the remote share');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_RECEIVED) {
-			$subject = $this->l->t('You received a new remote share {file} from {user}');
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
-			$subject = $this->l->t('{user} accepted the remote share of {file}');
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
-			$subject = $this->l->t('{user} declined the remote share of {file}');
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_UNSHARED) {
-			$subject = $this->l->t('{user} unshared {file} from you');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_REMOTE_SHARE_RECEIVED:
-			case self::SUBJECT_REMOTE_SHARE_UNSHARED:
-				return [
-					'file' => [
-						'type' => 'pending-federated-share',
-						'id' => $parameters[1],
-						'name' => $parameters[1],
-					],
-					'user' => $this->getFederatedUser($parameters[0]),
-				];
-			case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
-			case self::SUBJECT_REMOTE_SHARE_DECLINED:
-				return [
-					'file' => $this->getFile([$event->getObjectId() => $event->getObjectName()]),
-					'user' => $this->getFederatedUser($parameters[0]),
-				];
-		}
-		throw new \InvalidArgumentException();
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return array
-	 */
-	protected function getFederatedUser($cloudId) {
-		$remoteUser = $this->cloudIdManager->resolveCloudId($cloudId);
-		return [
-			'type' => 'user',
-			'id' => $remoteUser->getUser(),
-			'name' => $cloudId,// Todo display name from contacts
-			'server' => $remoteUser->getRemote(),
-		];
-	}
+    protected $cloudIdManager;
+
+    const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted';
+    const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined';
+    const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received';
+    const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared';
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(IFactory $languageFactory,
+                                IURLGenerator $url,
+                                IManager $activityManager,
+                                IUserManager $userManager,
+                                ICloudIdManager $cloudIdManager
+    ) {
+        parent::__construct($languageFactory, $url, $activityManager, $userManager);
+        $this->cloudIdManager = $cloudIdManager;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
+            $subject = $this->l->t('{user} accepted the remote share');
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
+            $subject = $this->l->t('{user} declined the remote share');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_RECEIVED) {
+            $subject = $this->l->t('You received a new remote share {file} from {user}');
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
+            $subject = $this->l->t('{user} accepted the remote share of {file}');
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
+            $subject = $this->l->t('{user} declined the remote share of {file}');
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_UNSHARED) {
+            $subject = $this->l->t('{user} unshared {file} from you');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_REMOTE_SHARE_RECEIVED:
+            case self::SUBJECT_REMOTE_SHARE_UNSHARED:
+                return [
+                    'file' => [
+                        'type' => 'pending-federated-share',
+                        'id' => $parameters[1],
+                        'name' => $parameters[1],
+                    ],
+                    'user' => $this->getFederatedUser($parameters[0]),
+                ];
+            case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
+            case self::SUBJECT_REMOTE_SHARE_DECLINED:
+                return [
+                    'file' => $this->getFile([$event->getObjectId() => $event->getObjectName()]),
+                    'user' => $this->getFederatedUser($parameters[0]),
+                ];
+        }
+        throw new \InvalidArgumentException();
+    }
+
+    /**
+     * @param string $cloudId
+     * @return array
+     */
+    protected function getFederatedUser($cloudId) {
+        $remoteUser = $this->cloudIdManager->resolveCloudId($cloudId);
+        return [
+            'type' => 'user',
+            'id' => $remoteUser->getUser(),
+            'name' => $cloudId,// Todo display name from contacts
+            'server' => $remoteUser->getRemote(),
+        ];
+    }
 }

Please login to merge, or discard this patch.

apps/files_sharing/lib/Activity/Providers/Groups.php 1 patch

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

@@ -25,92 +25,92 @@
 block discarded – undo
 
 class Groups extends Base {
 
-	const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self';
-	const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
-	const SUBJECT_UNSHARED_GROUP_SELF = 'unshared_group_self';
-	const SUBJECT_UNSHARED_GROUP_BY = 'unshared_group_by';
+    const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self';
+    const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
+    const SUBJECT_UNSHARED_GROUP_SELF = 'unshared_group_self';
+    const SUBJECT_UNSHARED_GROUP_BY = 'unshared_group_by';
 
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
 
-		if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
-			$subject = $this->l->t('Shared with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
-			$subject = $this->l->t('Removed share for group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
-			$subject = $this->l->t('{actor} shared with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
-			$subject = $this->l->t('{actor} removed share for group {group}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
+            $subject = $this->l->t('Shared with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
+            $subject = $this->l->t('Removed share for group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
+            $subject = $this->l->t('{actor} shared with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
+            $subject = $this->l->t('{actor} removed share for group {group}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
 
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		$this->setSubjects($event, $subject, $parsedParameters);
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        $this->setSubjects($event, $subject, $parsedParameters);
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
 
-		if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
-			$subject = $this->l->t('You shared {file} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
-			$subject = $this->l->t('You removed group {group} from {file}');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
-			$subject = $this->l->t('{actor} shared {file} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
-			$subject = $this->l->t('{actor} removed group {group} from {file}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
+            $subject = $this->l->t('You shared {file} with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
+            $subject = $this->l->t('You removed group {group} from {file}');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
+            $subject = $this->l->t('{actor} shared {file} with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
+            $subject = $this->l->t('{actor} removed group {group} from {file}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
 
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		$this->setSubjects($event, $subject, $parsedParameters);
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        $this->setSubjects($event, $subject, $parsedParameters);
 
-		return $event;
-	}
+        return $event;
+    }
 
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
 
-		switch ($subject) {
-			case self::SUBJECT_RESHARED_GROUP_BY:
-			case self::SUBJECT_UNSHARED_GROUP_BY:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'group' => [
-						'type' => 'group',
-						'id' => $parameters[2],
-						'name' => $parameters[2],
-					],
-					'actor' => $this->getUser($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_GROUP_SELF:
-			case self::SUBJECT_UNSHARED_GROUP_SELF:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'group' => [
-						'type' => 'group',
-						'id' => $parameters[1],
-						'name' => $parameters[1],
-					],
-				];
-		}
-		return [];
-	}
+        switch ($subject) {
+            case self::SUBJECT_RESHARED_GROUP_BY:
+            case self::SUBJECT_UNSHARED_GROUP_BY:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'group' => [
+                        'type' => 'group',
+                        'id' => $parameters[2],
+                        'name' => $parameters[2],
+                    ],
+                    'actor' => $this->getUser($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_GROUP_SELF:
+            case self::SUBJECT_UNSHARED_GROUP_SELF:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'group' => [
+                        'type' => 'group',
+                        'id' => $parameters[1],
+                        'name' => $parameters[1],
+                    ],
+                ];
+        }
+        return [];
+    }
 }

Please login to merge, or discard this patch.

apps/files_sharing/lib/Activity/Settings/Shared.php 1 patch

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

@@ -27,72 +27,72 @@
 block discarded – undo
 
 class Shared 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 'shared';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'shared';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder has been <strong>shared</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder has been <strong>shared</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 10;
-	}
+    /**
+     * @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 10;
+    }
 
-	/**
-	 * @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 true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return true;
+    }
 }
 

Please login to merge, or discard this patch.

apps/files_sharing/lib/Activity/Settings/PublicLinks.php 1 patch

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

@@ -27,72 +27,72 @@
 block discarded – undo
 
 class PublicLinks 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 'public_links';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'public_links';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</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 20;
-	}
+    /**
+     * @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 20;
+    }
 
-	/**
-	 * @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_sharing/lib/Activity/Settings/RemoteShare.php 1 patch

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

@@ -27,72 +27,72 @@
 block discarded – undo
 
 class RemoteShare 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 'remote_share';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'remote_share';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A file or folder was shared from <strong>another server</strong>');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A file or folder was shared from <strong>another server</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 11;
-	}
+    /**
+     * @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 11;
+    }
 
-	/**
-	 * @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 true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return true;
+    }
 }
 

Please login to merge, or discard this patch.

apps/files_sharing/lib/Activity/Filter.php 1 patch

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

@@ -27,69 +27,69 @@
 block discarded – undo
 use OCP\IURLGenerator;
 
 class Filter implements IFilter {
-	const TYPE_REMOTE_SHARE = 'remote_share';
-	const TYPE_SHARED = 'shared';
+    const TYPE_REMOTE_SHARE = 'remote_share';
+    const TYPE_SHARED = 'shared';
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	public function __construct(IL10N $l, IURLGenerator $url) {
-		$this->l = $l;
-		$this->url = $url;
-	}
+    public function __construct(IL10N $l, IURLGenerator $url) {
+        $this->l = $l;
+        $this->url = $url;
+    }
 
-	/**
-	 * @return string Lowercase a-z only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'files_sharing';
-	}
+    /**
+     * @return string Lowercase a-z only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'files_sharing';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('File shares');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('File shares');
+    }
 
-	/**
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 31;
-	}
+    /**
+     * @return int
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 31;
+    }
 
-	/**
-	 * @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/share.svg'));
-	}
+    /**
+     * @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/share.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([
-			self::TYPE_SHARED,
-			self::TYPE_REMOTE_SHARE
-		], $types);
-	}
+    /**
+     * @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([
+            self::TYPE_SHARED,
+            self::TYPE_REMOTE_SHARE
+        ], $types);
+    }
 
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return ['files_sharing'];
-	}
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return ['files_sharing'];
+    }
 }

Please login to merge, or discard this patch.

apps/files_sharing/lib/ExpireSharesJob.php 1 patch

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

@@ -29,49 +29,49 @@
 block discarded – undo
  */
 class ExpireSharesJob extends TimedJob {
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		// Run once a day
-		$this->setInterval(24 * 60 * 60);
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        // Run once a day
+        $this->setInterval(24 * 60 * 60);
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$connection = \OC::$server->getDatabaseConnection();
-		$logger = \OC::$server->getLogger();
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $connection = \OC::$server->getDatabaseConnection();
+        $logger = \OC::$server->getLogger();
 
-		//Current time
-		$now = new \DateTime();
-		$now = $now->format('Y-m-d H:i:s');
+        //Current time
+        $now = new \DateTime();
+        $now = $now->format('Y-m-d H:i:s');
 
-		/*
+        /*
 		 * Expire file link shares only (for now)
 		 */
-		$qb = $connection->getQueryBuilder();
-		$qb->select('id', 'file_source', 'uid_owner', 'item_type')
-			->from('share')
-			->where(
-				$qb->expr()->andX(
-					$qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)),
-					$qb->expr()->lte('expiration', $qb->expr()->literal($now)),
-					$qb->expr()->orX(
-						$qb->expr()->eq('item_type', $qb->expr()->literal('file')),
-						$qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
-					)
-				)
-			);
+        $qb = $connection->getQueryBuilder();
+        $qb->select('id', 'file_source', 'uid_owner', 'item_type')
+            ->from('share')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)),
+                    $qb->expr()->lte('expiration', $qb->expr()->literal($now)),
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('file')),
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
+                    )
+                )
+            );
 
-		$shares = $qb->execute();
-		while($share = $shares->fetch()) {
-			\OCP\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
-		}
-		$shares->closeCursor();
-	}
+        $shares = $qb->execute();
+        while($share = $shares->fetch()) {
+            \OCP\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
+        }
+        $shares->closeCursor();
+    }
 
 }

Please login to merge, or discard this patch.

apps/files_sharing/lib/Controller/ExternalSharesController.php 1 patch

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

@@ -39,112 +39,112 @@
 block discarded – undo
  */
 class ExternalSharesController extends Controller {
 
-	/** @var \OCA\Files_Sharing\External\Manager */
-	private $externalManager;
-	/** @var IClientService */
-	private $clientService;
+    /** @var \OCA\Files_Sharing\External\Manager */
+    private $externalManager;
+    /** @var IClientService */
+    private $clientService;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param \OCA\Files_Sharing\External\Manager $externalManager
-	 * @param IClientService $clientService
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								\OCA\Files_Sharing\External\Manager $externalManager,
-								IClientService $clientService) {
-		parent::__construct($appName, $request);
-		$this->externalManager = $externalManager;
-		$this->clientService = $clientService;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param \OCA\Files_Sharing\External\Manager $externalManager
+     * @param IClientService $clientService
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                \OCA\Files_Sharing\External\Manager $externalManager,
+                                IClientService $clientService) {
+        parent::__construct($appName, $request);
+        $this->externalManager = $externalManager;
+        $this->clientService = $clientService;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @return JSONResponse
-	 */
-	public function index() {
-		return new JSONResponse($this->externalManager->getOpenShares());
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @return JSONResponse
+     */
+    public function index() {
+        return new JSONResponse($this->externalManager->getOpenShares());
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @param int $id
-	 * @return JSONResponse
-	 */
-	public function create($id) {
-		$this->externalManager->acceptShare($id);
-		return new JSONResponse();
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @param int $id
+     * @return JSONResponse
+     */
+    public function create($id) {
+        $this->externalManager->acceptShare($id);
+        return new JSONResponse();
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoOutgoingFederatedSharingRequired
-	 *
-	 * @param integer $id
-	 * @return JSONResponse
-	 */
-	public function destroy($id) {
-		$this->externalManager->declineShare($id);
-		return new JSONResponse();
-	}
+    /**
+     * @NoAdminRequired
+     * @NoOutgoingFederatedSharingRequired
+     *
+     * @param integer $id
+     * @return JSONResponse
+     */
+    public function destroy($id) {
+        $this->externalManager->declineShare($id);
+        return new JSONResponse();
+    }
 
-	/**
-	 * Test whether the specified remote is accessible
-	 *
-	 * @param string $remote
-	 * @param bool $checkVersion
-	 * @return bool
-	 */
-	protected function testUrl($remote, $checkVersion = false) {
-		try {
-			$client = $this->clientService->newClient();
-			$response = json_decode($client->get(
-				$remote,
-				[
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			)->getBody());
+    /**
+     * Test whether the specified remote is accessible
+     *
+     * @param string $remote
+     * @param bool $checkVersion
+     * @return bool
+     */
+    protected function testUrl($remote, $checkVersion = false) {
+        try {
+            $client = $this->clientService->newClient();
+            $response = json_decode($client->get(
+                $remote,
+                [
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            )->getBody());
 
-			if ($checkVersion) {
-				return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
-			} else {
-				return is_object($response);
-			}
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
+            if ($checkVersion) {
+                return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
+            } else {
+                return is_object($response);
+            }
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoOutgoingFederatedSharingRequired
-	 * @NoIncomingFederatedSharingRequired
-	 *
-	 * @param string $remote
-	 * @return DataResponse
-	 */
-	public function testRemote($remote) {
-		if (
-			$this->testUrl('https://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('https://' . $remote . '/status.php', true)
-		) {
-			return new DataResponse('https');
-		} elseif (
-			$this->testUrl('http://' . $remote . '/ocs-provider/') ||
-			$this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
-			$this->testUrl('http://' . $remote . '/status.php', true)
-		) {
-			return new DataResponse('http');
-		} else {
-			return new DataResponse(false);
-		}
-	}
+    /**
+     * @PublicPage
+     * @NoOutgoingFederatedSharingRequired
+     * @NoIncomingFederatedSharingRequired
+     *
+     * @param string $remote
+     * @return DataResponse
+     */
+    public function testRemote($remote) {
+        if (
+            $this->testUrl('https://' . $remote . '/ocs-provider/') ||
+            $this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
+            $this->testUrl('https://' . $remote . '/status.php', true)
+        ) {
+            return new DataResponse('https');
+        } elseif (
+            $this->testUrl('http://' . $remote . '/ocs-provider/') ||
+            $this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
+            $this->testUrl('http://' . $remote . '/status.php', true)
+        ) {
+            return new DataResponse('http');
+        } else {
+            return new DataResponse(false);
+        }
+    }
 
 }

Please login to merge, or discard this patch.

		@@ -25,97 +25,97 @@
		block discarded – undo
25	25
26	26	class PublicLinks extends Base {
27	27
28		- const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
29		- const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
30		- const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self';
31		- const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by';
32		- const SUBJECT_LINK_EXPIRED = 'link_expired';
33		- const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired';
34		-
35		- /**
36		- * @param IEvent $event
37		- * @return IEvent
38		- * @throws \InvalidArgumentException
39		- * @since 11.0.0
40		- */
41		- public function parseShortVersion(IEvent $event) {
42		- $parsedParameters = $this->getParsedParameters($event);
43		-
44		- if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
45		- $subject = $this->l->t('Shared as public link');
46		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
47		- $subject = $this->l->t('Removed public link');
48		- } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
49		- $subject = $this->l->t('Public link expired');
50		- } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
51		- $subject = $this->l->t('{actor} shared as public link');
52		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
53		- $subject = $this->l->t('{actor} removed public link');
54		- } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
55		- $subject = $this->l->t('Public link of {actor} expired');
56		-
57		- } else {
58		- throw new \InvalidArgumentException();
59		- }
60		-
61		- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
62		- $this->setSubjects($event, $subject, $parsedParameters);
63		-
64		- return $event;
65		- }
66		-
67		- /**
68		- * @param IEvent $event
69		- * @return IEvent
70		- * @throws \InvalidArgumentException
71		- * @since 11.0.0
72		- */
73		- public function parseLongVersion(IEvent $event) {
74		- $parsedParameters = $this->getParsedParameters($event);
75		-
76		- if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
77		- $subject = $this->l->t('You shared {file} as public link');
78		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
79		- $subject = $this->l->t('You removed public link for {file}');
80		- } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
81		- $subject = $this->l->t('Public link expired for {file}');
82		- } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
83		- $subject = $this->l->t('{actor} shared {file} as public link');
84		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
85		- $subject = $this->l->t('{actor} removed public link for {file}');
86		- } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
87		- $subject = $this->l->t('Public link of {actor} for {file} expired');
88		-
89		- } else {
90		- throw new \InvalidArgumentException();
91		- }
92		-
93		- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
94		- $this->setSubjects($event, $subject, $parsedParameters);
95		-
96		- return $event;
97		- }
98		-
99		- protected function getParsedParameters(IEvent $event) {
100		- $subject = $event->getSubject();
101		- $parameters = $event->getSubjectParameters();
102		-
103		- switch ($subject) {
104		- case self::SUBJECT_SHARED_LINK_SELF:
105		- case self::SUBJECT_UNSHARED_LINK_SELF:
106		- case self::SUBJECT_LINK_EXPIRED:
107		- return [
108		- 'file' => $this->getFile($parameters[0], $event),
109		- ];
110		- case self::SUBJECT_RESHARED_LINK_BY:
111		- case self::SUBJECT_UNSHARED_LINK_BY:
112		- case self::SUBJECT_LINK_BY_EXPIRED:
113		- return [
114		- 'file' => $this->getFile($parameters[0], $event),
115		- 'actor' => $this->getUser($parameters[1]),
116		- ];
117		- }
118		- return [];
119		- }
	28	+ const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
	29	+ const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
	30	+ const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self';
	31	+ const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by';
	32	+ const SUBJECT_LINK_EXPIRED = 'link_expired';
	33	+ const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired';
	34	+
	35	+ /**
	36	+ * @param IEvent $event
	37	+ * @return IEvent
	38	+ * @throws \InvalidArgumentException
	39	+ * @since 11.0.0
	40	+ */
	41	+ public function parseShortVersion(IEvent $event) {
	42	+ $parsedParameters = $this->getParsedParameters($event);
	43	+
	44	+ if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
	45	+ $subject = $this->l->t('Shared as public link');
	46	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
	47	+ $subject = $this->l->t('Removed public link');
	48	+ } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
	49	+ $subject = $this->l->t('Public link expired');
	50	+ } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
	51	+ $subject = $this->l->t('{actor} shared as public link');
	52	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
	53	+ $subject = $this->l->t('{actor} removed public link');
	54	+ } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
	55	+ $subject = $this->l->t('Public link of {actor} expired');
	56	+
	57	+ } else {
	58	+ throw new \InvalidArgumentException();
	59	+ }
	60	+
	61	+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
	62	+ $this->setSubjects($event, $subject, $parsedParameters);
	63	+
	64	+ return $event;
	65	+ }
	66	+
	67	+ /**
	68	+ * @param IEvent $event
	69	+ * @return IEvent
	70	+ * @throws \InvalidArgumentException
	71	+ * @since 11.0.0
	72	+ */
	73	+ public function parseLongVersion(IEvent $event) {
	74	+ $parsedParameters = $this->getParsedParameters($event);
	75	+
	76	+ if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
	77	+ $subject = $this->l->t('You shared {file} as public link');
	78	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
	79	+ $subject = $this->l->t('You removed public link for {file}');
	80	+ } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
	81	+ $subject = $this->l->t('Public link expired for {file}');
	82	+ } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
	83	+ $subject = $this->l->t('{actor} shared {file} as public link');
	84	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
	85	+ $subject = $this->l->t('{actor} removed public link for {file}');
	86	+ } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
	87	+ $subject = $this->l->t('Public link of {actor} for {file} expired');
	88	+
	89	+ } else {
	90	+ throw new \InvalidArgumentException();
	91	+ }
	92	+
	93	+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
	94	+ $this->setSubjects($event, $subject, $parsedParameters);
	95	+
	96	+ return $event;
	97	+ }
	98	+
	99	+ protected function getParsedParameters(IEvent $event) {
	100	+ $subject = $event->getSubject();
	101	+ $parameters = $event->getSubjectParameters();
	102	+
	103	+ switch ($subject) {
	104	+ case self::SUBJECT_SHARED_LINK_SELF:
	105	+ case self::SUBJECT_UNSHARED_LINK_SELF:
	106	+ case self::SUBJECT_LINK_EXPIRED:
	107	+ return [
	108	+ 'file' => $this->getFile($parameters[0], $event),
	109	+ ];
	110	+ case self::SUBJECT_RESHARED_LINK_BY:
	111	+ case self::SUBJECT_UNSHARED_LINK_BY:
	112	+ case self::SUBJECT_LINK_BY_EXPIRED:
	113	+ return [
	114	+ 'file' => $this->getFile($parameters[0], $event),
	115	+ 'actor' => $this->getUser($parameters[1]),
	116	+ ];
	117	+ }
	118	+ return [];
	119	+ }
120	120
121	121	}

		@@ -32,116 +32,116 @@
		block discarded – undo
32	32
33	33	class RemoteShares extends Base {
34	34
35		- protected $cloudIdManager;
36		-
37		- const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted';
38		- const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined';
39		- const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received';
40		- const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared';
41		-
42		- /**
43		- * @param IFactory $languageFactory
44		- * @param IURLGenerator $url
45		- * @param IManager $activityManager
46		- * @param IUserManager $userManager
47		- * @param ICloudIdManager $cloudIdManager
48		- */
49		- public function __construct(IFactory $languageFactory,
50		- IURLGenerator $url,
51		- IManager $activityManager,
52		- IUserManager $userManager,
53		- ICloudIdManager $cloudIdManager
54		- ) {
55		- parent::__construct($languageFactory, $url, $activityManager, $userManager);
56		- $this->cloudIdManager = $cloudIdManager;
57		- }
58		-
59		- /**
60		- * @param IEvent $event
61		- * @return IEvent
62		- * @throws \InvalidArgumentException
63		- * @since 11.0.0
64		- */
65		- public function parseShortVersion(IEvent $event) {
66		- $parsedParameters = $this->getParsedParameters($event);
67		-
68		- if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
69		- $subject = $this->l->t('{user} accepted the remote share');
70		- } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
71		- $subject = $this->l->t('{user} declined the remote share');
72		- } else {
73		- throw new \InvalidArgumentException();
74		- }
75		-
76		- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
77		- $this->setSubjects($event, $subject, $parsedParameters);
78		-
79		- return $event;
80		- }
81		-
82		- /**
83		- * @param IEvent $event
84		- * @return IEvent
85		- * @throws \InvalidArgumentException
86		- * @since 11.0.0
87		- */
88		- public function parseLongVersion(IEvent $event) {
89		- $parsedParameters = $this->getParsedParameters($event);
90		-
91		- if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_RECEIVED) {
92		- $subject = $this->l->t('You received a new remote share {file} from {user}');
93		- } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
94		- $subject = $this->l->t('{user} accepted the remote share of {file}');
95		- } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
96		- $subject = $this->l->t('{user} declined the remote share of {file}');
97		- } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_UNSHARED) {
98		- $subject = $this->l->t('{user} unshared {file} from you');
99		- } else {
100		- throw new \InvalidArgumentException();
101		- }
102		-
103		- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
104		- $this->setSubjects($event, $subject, $parsedParameters);
105		-
106		- return $event;
107		- }
108		-
109		- protected function getParsedParameters(IEvent $event) {
110		- $subject = $event->getSubject();
111		- $parameters = $event->getSubjectParameters();
112		-
113		- switch ($subject) {
114		- case self::SUBJECT_REMOTE_SHARE_RECEIVED:
115		- case self::SUBJECT_REMOTE_SHARE_UNSHARED:
116		- return [
117		- 'file' => [
118		- 'type' => 'pending-federated-share',
119		- 'id' => $parameters[1],
120		- 'name' => $parameters[1],
121		- ],
122		- 'user' => $this->getFederatedUser($parameters[0]),
123		- ];
124		- case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
125		- case self::SUBJECT_REMOTE_SHARE_DECLINED:
126		- return [
127		- 'file' => $this->getFile([$event->getObjectId() => $event->getObjectName()]),
128		- 'user' => $this->getFederatedUser($parameters[0]),
129		- ];
130		- }
131		- throw new \InvalidArgumentException();
132		- }
133		-
134		- /**
135		- * @param string $cloudId
136		- * @return array
137		- */
138		- protected function getFederatedUser($cloudId) {
139		- $remoteUser = $this->cloudIdManager->resolveCloudId($cloudId);
140		- return [
141		- 'type' => 'user',
142		- 'id' => $remoteUser->getUser(),
143		- 'name' => $cloudId,// Todo display name from contacts
144		- 'server' => $remoteUser->getRemote(),
145		- ];
146		- }
	35	+ protected $cloudIdManager;
	36	+
	37	+ const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted';
	38	+ const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined';
	39	+ const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received';
	40	+ const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared';
	41	+
	42	+ /**
	43	+ * @param IFactory $languageFactory
	44	+ * @param IURLGenerator $url
	45	+ * @param IManager $activityManager
	46	+ * @param IUserManager $userManager
	47	+ * @param ICloudIdManager $cloudIdManager
	48	+ */
	49	+ public function __construct(IFactory $languageFactory,
	50	+ IURLGenerator $url,
	51	+ IManager $activityManager,
	52	+ IUserManager $userManager,
	53	+ ICloudIdManager $cloudIdManager
	54	+ ) {
	55	+ parent::__construct($languageFactory, $url, $activityManager, $userManager);
	56	+ $this->cloudIdManager = $cloudIdManager;
	57	+ }
	58	+
	59	+ /**
	60	+ * @param IEvent $event
	61	+ * @return IEvent
	62	+ * @throws \InvalidArgumentException
	63	+ * @since 11.0.0
	64	+ */
	65	+ public function parseShortVersion(IEvent $event) {
	66	+ $parsedParameters = $this->getParsedParameters($event);
	67	+
	68	+ if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
	69	+ $subject = $this->l->t('{user} accepted the remote share');
	70	+ } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
	71	+ $subject = $this->l->t('{user} declined the remote share');
	72	+ } else {
	73	+ throw new \InvalidArgumentException();
	74	+ }
	75	+
	76	+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
	77	+ $this->setSubjects($event, $subject, $parsedParameters);
	78	+
	79	+ return $event;
	80	+ }
	81	+
	82	+ /**
	83	+ * @param IEvent $event
	84	+ * @return IEvent
	85	+ * @throws \InvalidArgumentException
	86	+ * @since 11.0.0
	87	+ */
	88	+ public function parseLongVersion(IEvent $event) {
	89	+ $parsedParameters = $this->getParsedParameters($event);
	90	+
	91	+ if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_RECEIVED) {
	92	+ $subject = $this->l->t('You received a new remote share {file} from {user}');
	93	+ } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
	94	+ $subject = $this->l->t('{user} accepted the remote share of {file}');
	95	+ } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
	96	+ $subject = $this->l->t('{user} declined the remote share of {file}');
	97	+ } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_UNSHARED) {
	98	+ $subject = $this->l->t('{user} unshared {file} from you');
	99	+ } else {
	100	+ throw new \InvalidArgumentException();
	101	+ }
	102	+
	103	+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
	104	+ $this->setSubjects($event, $subject, $parsedParameters);
	105	+
	106	+ return $event;
	107	+ }
	108	+
	109	+ protected function getParsedParameters(IEvent $event) {
	110	+ $subject = $event->getSubject();
	111	+ $parameters = $event->getSubjectParameters();
	112	+
	113	+ switch ($subject) {
	114	+ case self::SUBJECT_REMOTE_SHARE_RECEIVED:
	115	+ case self::SUBJECT_REMOTE_SHARE_UNSHARED:
	116	+ return [
	117	+ 'file' => [
	118	+ 'type' => 'pending-federated-share',
	119	+ 'id' => $parameters[1],
	120	+ 'name' => $parameters[1],
	121	+ ],
	122	+ 'user' => $this->getFederatedUser($parameters[0]),
	123	+ ];
	124	+ case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
	125	+ case self::SUBJECT_REMOTE_SHARE_DECLINED:
	126	+ return [
	127	+ 'file' => $this->getFile([$event->getObjectId() => $event->getObjectName()]),
	128	+ 'user' => $this->getFederatedUser($parameters[0]),
	129	+ ];
	130	+ }
	131	+ throw new \InvalidArgumentException();
	132	+ }
	133	+
	134	+ /**
	135	+ * @param string $cloudId
	136	+ * @return array
	137	+ */
	138	+ protected function getFederatedUser($cloudId) {
	139	+ $remoteUser = $this->cloudIdManager->resolveCloudId($cloudId);
	140	+ return [
	141	+ 'type' => 'user',
	142	+ 'id' => $remoteUser->getUser(),
	143	+ 'name' => $cloudId,// Todo display name from contacts
	144	+ 'server' => $remoteUser->getRemote(),
	145	+ ];
	146	+ }
147	147	}

		@@ -25,92 +25,92 @@
		block discarded – undo
25	25
26	26	class Groups extends Base {
27	27
28		- const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self';
29		- const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
30		- const SUBJECT_UNSHARED_GROUP_SELF = 'unshared_group_self';
31		- const SUBJECT_UNSHARED_GROUP_BY = 'unshared_group_by';
	28	+ const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self';
	29	+ const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
	30	+ const SUBJECT_UNSHARED_GROUP_SELF = 'unshared_group_self';
	31	+ const SUBJECT_UNSHARED_GROUP_BY = 'unshared_group_by';
32	32
33		- /**
34		- * @param IEvent $event
35		- * @return IEvent
36		- * @throws \InvalidArgumentException
37		- * @since 11.0.0
38		- */
39		- public function parseShortVersion(IEvent $event) {
40		- $parsedParameters = $this->getParsedParameters($event);
	33	+ /**
	34	+ * @param IEvent $event
	35	+ * @return IEvent
	36	+ * @throws \InvalidArgumentException
	37	+ * @since 11.0.0
	38	+ */
	39	+ public function parseShortVersion(IEvent $event) {
	40	+ $parsedParameters = $this->getParsedParameters($event);
41	41
42		- if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
43		- $subject = $this->l->t('Shared with group {group}');
44		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
45		- $subject = $this->l->t('Removed share for group {group}');
46		- } else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
47		- $subject = $this->l->t('{actor} shared with group {group}');
48		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
49		- $subject = $this->l->t('{actor} removed share for group {group}');
50		- } else {
51		- throw new \InvalidArgumentException();
52		- }
	42	+ if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
	43	+ $subject = $this->l->t('Shared with group {group}');
	44	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
	45	+ $subject = $this->l->t('Removed share for group {group}');
	46	+ } else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
	47	+ $subject = $this->l->t('{actor} shared with group {group}');
	48	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
	49	+ $subject = $this->l->t('{actor} removed share for group {group}');
	50	+ } else {
	51	+ throw new \InvalidArgumentException();
	52	+ }
53	53
54		- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
55		- $this->setSubjects($event, $subject, $parsedParameters);
	54	+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
	55	+ $this->setSubjects($event, $subject, $parsedParameters);
56	56
57		- return $event;
58		- }
	57	+ return $event;
	58	+ }
59	59
60		- /**
61		- * @param IEvent $event
62		- * @return IEvent
63		- * @throws \InvalidArgumentException
64		- * @since 11.0.0
65		- */
66		- public function parseLongVersion(IEvent $event) {
67		- $parsedParameters = $this->getParsedParameters($event);
	60	+ /**
	61	+ * @param IEvent $event
	62	+ * @return IEvent
	63	+ * @throws \InvalidArgumentException
	64	+ * @since 11.0.0
	65	+ */
	66	+ public function parseLongVersion(IEvent $event) {
	67	+ $parsedParameters = $this->getParsedParameters($event);
68	68
69		- if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
70		- $subject = $this->l->t('You shared {file} with group {group}');
71		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
72		- $subject = $this->l->t('You removed group {group} from {file}');
73		- } else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
74		- $subject = $this->l->t('{actor} shared {file} with group {group}');
75		- } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
76		- $subject = $this->l->t('{actor} removed group {group} from {file}');
77		- } else {
78		- throw new \InvalidArgumentException();
79		- }
	69	+ if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
	70	+ $subject = $this->l->t('You shared {file} with group {group}');
	71	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
	72	+ $subject = $this->l->t('You removed group {group} from {file}');
	73	+ } else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
	74	+ $subject = $this->l->t('{actor} shared {file} with group {group}');
	75	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
	76	+ $subject = $this->l->t('{actor} removed group {group} from {file}');
	77	+ } else {
	78	+ throw new \InvalidArgumentException();
	79	+ }
80	80
81		- $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
82		- $this->setSubjects($event, $subject, $parsedParameters);
	81	+ $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
	82	+ $this->setSubjects($event, $subject, $parsedParameters);
83	83
84		- return $event;
85		- }
	84	+ return $event;
	85	+ }
86	86
87		- protected function getParsedParameters(IEvent $event) {
88		- $subject = $event->getSubject();
89		- $parameters = $event->getSubjectParameters();
	87	+ protected function getParsedParameters(IEvent $event) {
	88	+ $subject = $event->getSubject();
	89	+ $parameters = $event->getSubjectParameters();
90	90
91		- switch ($subject) {
92		- case self::SUBJECT_RESHARED_GROUP_BY:
93		- case self::SUBJECT_UNSHARED_GROUP_BY:
94		- return [
95		- 'file' => $this->getFile($parameters[0], $event),
96		- 'group' => [
97		- 'type' => 'group',
98		- 'id' => $parameters[2],
99		- 'name' => $parameters[2],
100		- ],
101		- 'actor' => $this->getUser($parameters[1]),
102		- ];
103		- case self::SUBJECT_SHARED_GROUP_SELF:
104		- case self::SUBJECT_UNSHARED_GROUP_SELF:
105		- return [
106		- 'file' => $this->getFile($parameters[0], $event),
107		- 'group' => [
108		- 'type' => 'group',
109		- 'id' => $parameters[1],
110		- 'name' => $parameters[1],
111		- ],
112		- ];
113		- }
114		- return [];
115		- }
	91	+ switch ($subject) {
	92	+ case self::SUBJECT_RESHARED_GROUP_BY:
	93	+ case self::SUBJECT_UNSHARED_GROUP_BY:
	94	+ return [
	95	+ 'file' => $this->getFile($parameters[0], $event),
	96	+ 'group' => [
	97	+ 'type' => 'group',
	98	+ 'id' => $parameters[2],
	99	+ 'name' => $parameters[2],
	100	+ ],
	101	+ 'actor' => $this->getUser($parameters[1]),
	102	+ ];
	103	+ case self::SUBJECT_SHARED_GROUP_SELF:
	104	+ case self::SUBJECT_UNSHARED_GROUP_SELF:
	105	+ return [
	106	+ 'file' => $this->getFile($parameters[0], $event),
	107	+ 'group' => [
	108	+ 'type' => 'group',
	109	+ 'id' => $parameters[1],
	110	+ 'name' => $parameters[1],
	111	+ ],
	112	+ ];
	113	+ }
	114	+ return [];
	115	+ }
116	116	}

		@@ -27,72 +27,72 @@
		block discarded – undo
27	27
28	28	class Shared 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 'shared';
46		- }
	40	+ /**
	41	+ * @return string Lowercase a-z and underscore only identifier
	42	+ * @since 11.0.0
	43	+ */
	44	+ public function getIdentifier() {
	45	+ return 'shared';
	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>shared</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>shared</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 10;
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 10;
	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 true;
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 true;
	96	+ }
97	97	}
98	98

		@@ -27,72 +27,72 @@
		block discarded – undo
27	27
28	28	class PublicLinks 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 'public_links';
46		- }
	40	+ /**
	41	+ * @return string Lowercase a-z and underscore only identifier
	42	+ * @since 11.0.0
	43	+ */
	44	+ public function getIdentifier() {
	45	+ return 'public_links';
	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 shared by mail or by public link was <strong>downloaded</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 shared by mail or by public link was <strong>downloaded</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 20;
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 20;
	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 RemoteShare 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 'remote_share';
46		- }
	40	+ /**
	41	+ * @return string Lowercase a-z and underscore only identifier
	42	+ * @since 11.0.0
	43	+ */
	44	+ public function getIdentifier() {
	45	+ return 'remote_share';
	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 was shared from <strong>another server</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 was shared from <strong>another server</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 11;
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 11;
	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 true;
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 true;
	96	+ }
97	97	}
98	98

		@@ -27,69 +27,69 @@
		block discarded – undo
27	27	use OCP\IURLGenerator;
28	28
29	29	class Filter implements IFilter {
30		- const TYPE_REMOTE_SHARE = 'remote_share';
31		- const TYPE_SHARED = 'shared';
	30	+ const TYPE_REMOTE_SHARE = 'remote_share';
	31	+ const TYPE_SHARED = 'shared';
32	32
33		- /** @var IL10N */
34		- protected $l;
	33	+ /** @var IL10N */
	34	+ protected $l;
35	35
36		- /** @var IURLGenerator */
37		- protected $url;
	36	+ /** @var IURLGenerator */
	37	+ protected $url;
38	38
39		- public function __construct(IL10N $l, IURLGenerator $url) {
40		- $this->l = $l;
41		- $this->url = $url;
42		- }
	39	+ public function __construct(IL10N $l, IURLGenerator $url) {
	40	+ $this->l = $l;
	41	+ $this->url = $url;
	42	+ }
43	43
44		- /**
45		- * @return string Lowercase a-z only identifier
46		- * @since 11.0.0
47		- */
48		- public function getIdentifier() {
49		- return 'files_sharing';
50		- }
	44	+ /**
	45	+ * @return string Lowercase a-z only identifier
	46	+ * @since 11.0.0
	47	+ */
	48	+ public function getIdentifier() {
	49	+ return 'files_sharing';
	50	+ }
51	51
52		- /**
53		- * @return string A translated string
54		- * @since 11.0.0
55		- */
56		- public function getName() {
57		- return $this->l->t('File shares');
58		- }
	52	+ /**
	53	+ * @return string A translated string
	54	+ * @since 11.0.0
	55	+ */
	56	+ public function getName() {
	57	+ return $this->l->t('File shares');
	58	+ }
59	59
60		- /**
61		- * @return int
62		- * @since 11.0.0
63		- */
64		- public function getPriority() {
65		- return 31;
66		- }
	60	+ /**
	61	+ * @return int
	62	+ * @since 11.0.0
	63	+ */
	64	+ public function getPriority() {
	65	+ return 31;
	66	+ }
67	67
68		- /**
69		- * @return string Full URL to an icon, empty string when none is given
70		- * @since 11.0.0
71		- */
72		- public function getIcon() {
73		- return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg'));
74		- }
	68	+ /**
	69	+ * @return string Full URL to an icon, empty string when none is given
	70	+ * @since 11.0.0
	71	+ */
	72	+ public function getIcon() {
	73	+ return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg'));
	74	+ }
75	75
76		- /**
77		- * @param string[] $types
78		- * @return string[] An array of allowed apps from which activities should be displayed
79		- * @since 11.0.0
80		- */
81		- public function filterTypes(array $types) {
82		- return array_intersect([
83		- self::TYPE_SHARED,
84		- self::TYPE_REMOTE_SHARE
85		- ], $types);
86		- }
	76	+ /**
	77	+ * @param string[] $types
	78	+ * @return string[] An array of allowed apps from which activities should be displayed
	79	+ * @since 11.0.0
	80	+ */
	81	+ public function filterTypes(array $types) {
	82	+ return array_intersect([
	83	+ self::TYPE_SHARED,
	84	+ self::TYPE_REMOTE_SHARE
	85	+ ], $types);
	86	+ }
87	87
88		- /**
89		- * @return string[] An array of allowed apps from which activities should be displayed
90		- * @since 11.0.0
91		- */
92		- public function allowedApps() {
93		- return ['files_sharing'];
94		- }
	88	+ /**
	89	+ * @return string[] An array of allowed apps from which activities should be displayed
	90	+ * @since 11.0.0
	91	+ */
	92	+ public function allowedApps() {
	93	+ return ['files_sharing'];
	94	+ }
95	95	}

		@@ -29,49 +29,49 @@
		block discarded – undo
29	29	*/
30	30	class ExpireSharesJob extends TimedJob {
31	31
32		- /**
33		- * sets the correct interval for this timed job
34		- */
35		- public function __construct() {
36		- // Run once a day
37		- $this->setInterval(24 * 60 * 60);
38		- }
	32	+ /**
	33	+ * sets the correct interval for this timed job
	34	+ */
	35	+ public function __construct() {
	36	+ // Run once a day
	37	+ $this->setInterval(24 * 60 * 60);
	38	+ }
39	39
40		- /**
41		- * Makes the background job do its work
42		- *
43		- * @param array $argument unused argument
44		- */
45		- public function run($argument) {
46		- $connection = \OC::$server->getDatabaseConnection();
47		- $logger = \OC::$server->getLogger();
	40	+ /**
	41	+ * Makes the background job do its work
	42	+ *
	43	+ * @param array $argument unused argument
	44	+ */
	45	+ public function run($argument) {
	46	+ $connection = \OC::$server->getDatabaseConnection();
	47	+ $logger = \OC::$server->getLogger();
48	48
49		- //Current time
50		- $now = new \DateTime();
51		- $now = $now->format('Y-m-d H:i:s');
	49	+ //Current time
	50	+ $now = new \DateTime();
	51	+ $now = $now->format('Y-m-d H:i:s');
52	52
53		- /*
	53	+ /*
54	54	* Expire file link shares only (for now)
55	55	*/
56		- $qb = $connection->getQueryBuilder();
57		- $qb->select('id', 'file_source', 'uid_owner', 'item_type')
58		- ->from('share')
59		- ->where(
60		- $qb->expr()->andX(
61		- $qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)),
62		- $qb->expr()->lte('expiration', $qb->expr()->literal($now)),
63		- $qb->expr()->orX(
64		- $qb->expr()->eq('item_type', $qb->expr()->literal('file')),
65		- $qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
66		- )
67		- )
68		- );
	56	+ $qb = $connection->getQueryBuilder();
	57	+ $qb->select('id', 'file_source', 'uid_owner', 'item_type')
	58	+ ->from('share')
	59	+ ->where(
	60	+ $qb->expr()->andX(
	61	+ $qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)),
	62	+ $qb->expr()->lte('expiration', $qb->expr()->literal($now)),
	63	+ $qb->expr()->orX(
	64	+ $qb->expr()->eq('item_type', $qb->expr()->literal('file')),
	65	+ $qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
	66	+ )
	67	+ )
	68	+ );
69	69
70		- $shares = $qb->execute();
71		- while($share = $shares->fetch()) {
72		- \OCP\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
73		- }
74		- $shares->closeCursor();
75		- }
	70	+ $shares = $qb->execute();
	71	+ while($share = $shares->fetch()) {
	72	+ \OCP\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
	73	+ }
	74	+ $shares->closeCursor();
	75	+ }
76	76
77	77	}

		@@ -39,112 +39,112 @@
		block discarded – undo
39	39	*/
40	40	class ExternalSharesController extends Controller {
41	41
42		- /** @var \OCA\Files_Sharing\External\Manager */
43		- private $externalManager;
44		- /** @var IClientService */
45		- private $clientService;
	42	+ /** @var \OCA\Files_Sharing\External\Manager */
	43	+ private $externalManager;
	44	+ /** @var IClientService */
	45	+ private $clientService;
46	46
47		- /**
48		- * @param string $appName
49		- * @param IRequest $request
50		- * @param \OCA\Files_Sharing\External\Manager $externalManager
51		- * @param IClientService $clientService
52		- */
53		- public function __construct($appName,
54		- IRequest $request,
55		- \OCA\Files_Sharing\External\Manager $externalManager,
56		- IClientService $clientService) {
57		- parent::__construct($appName, $request);
58		- $this->externalManager = $externalManager;
59		- $this->clientService = $clientService;
60		- }
	47	+ /**
	48	+ * @param string $appName
	49	+ * @param IRequest $request
	50	+ * @param \OCA\Files_Sharing\External\Manager $externalManager
	51	+ * @param IClientService $clientService
	52	+ */
	53	+ public function __construct($appName,
	54	+ IRequest $request,
	55	+ \OCA\Files_Sharing\External\Manager $externalManager,
	56	+ IClientService $clientService) {
	57	+ parent::__construct($appName, $request);
	58	+ $this->externalManager = $externalManager;
	59	+ $this->clientService = $clientService;
	60	+ }
61	61
62		- /**
63		- * @NoAdminRequired
64		- * @NoOutgoingFederatedSharingRequired
65		- *
66		- * @return JSONResponse
67		- */
68		- public function index() {
69		- return new JSONResponse($this->externalManager->getOpenShares());
70		- }
	62	+ /**
	63	+ * @NoAdminRequired
	64	+ * @NoOutgoingFederatedSharingRequired
	65	+ *
	66	+ * @return JSONResponse
	67	+ */
	68	+ public function index() {
	69	+ return new JSONResponse($this->externalManager->getOpenShares());
	70	+ }
71	71
72		- /**
73		- * @NoAdminRequired
74		- * @NoOutgoingFederatedSharingRequired
75		- *
76		- * @param int $id
77		- * @return JSONResponse
78		- */
79		- public function create($id) {
80		- $this->externalManager->acceptShare($id);
81		- return new JSONResponse();
82		- }
	72	+ /**
	73	+ * @NoAdminRequired
	74	+ * @NoOutgoingFederatedSharingRequired
	75	+ *
	76	+ * @param int $id
	77	+ * @return JSONResponse
	78	+ */
	79	+ public function create($id) {
	80	+ $this->externalManager->acceptShare($id);
	81	+ return new JSONResponse();
	82	+ }
83	83
84		- /**
85		- * @NoAdminRequired
86		- * @NoOutgoingFederatedSharingRequired
87		- *
88		- * @param integer $id
89		- * @return JSONResponse
90		- */
91		- public function destroy($id) {
92		- $this->externalManager->declineShare($id);
93		- return new JSONResponse();
94		- }
	84	+ /**
	85	+ * @NoAdminRequired
	86	+ * @NoOutgoingFederatedSharingRequired
	87	+ *
	88	+ * @param integer $id
	89	+ * @return JSONResponse
	90	+ */
	91	+ public function destroy($id) {
	92	+ $this->externalManager->declineShare($id);
	93	+ return new JSONResponse();
	94	+ }
95	95
96		- /**
97		- * Test whether the specified remote is accessible
98		- *
99		- * @param string $remote
100		- * @param bool $checkVersion
101		- * @return bool
102		- */
103		- protected function testUrl($remote, $checkVersion = false) {
104		- try {
105		- $client = $this->clientService->newClient();
106		- $response = json_decode($client->get(
107		- $remote,
108		- [
109		- 'timeout' => 3,
110		- 'connect_timeout' => 3,
111		- ]
112		- )->getBody());
	96	+ /**
	97	+ * Test whether the specified remote is accessible
	98	+ *
	99	+ * @param string $remote
	100	+ * @param bool $checkVersion
	101	+ * @return bool
	102	+ */
	103	+ protected function testUrl($remote, $checkVersion = false) {
	104	+ try {
	105	+ $client = $this->clientService->newClient();
	106	+ $response = json_decode($client->get(
	107	+ $remote,
	108	+ [
	109	+ 'timeout' => 3,
	110	+ 'connect_timeout' => 3,
	111	+ ]
	112	+ )->getBody());
113	113
114		- if ($checkVersion) {
115		- return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
116		- } else {
117		- return is_object($response);
118		- }
119		- } catch (\Exception $e) {
120		- return false;
121		- }
122		- }
	114	+ if ($checkVersion) {
	115	+ return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
	116	+ } else {
	117	+ return is_object($response);
	118	+ }
	119	+ } catch (\Exception $e) {
	120	+ return false;
	121	+ }
	122	+ }
123	123
124		- /**
125		- * @PublicPage
126		- * @NoOutgoingFederatedSharingRequired
127		- * @NoIncomingFederatedSharingRequired
128		- *
129		- * @param string $remote
130		- * @return DataResponse
131		- */
132		- public function testRemote($remote) {
133		- if (
134		- $this->testUrl('https://' . $remote . '/ocs-provider/') \|\|
135		- $this->testUrl('https://' . $remote . '/ocs-provider/index.php') \|\|
136		- $this->testUrl('https://' . $remote . '/status.php', true)
137		- ) {
138		- return new DataResponse('https');
139		- } elseif (
140		- $this->testUrl('http://' . $remote . '/ocs-provider/') \|\|
141		- $this->testUrl('http://' . $remote . '/ocs-provider/index.php') \|\|
142		- $this->testUrl('http://' . $remote . '/status.php', true)
143		- ) {
144		- return new DataResponse('http');
145		- } else {
146		- return new DataResponse(false);
147		- }
148		- }
	124	+ /**
	125	+ * @PublicPage
	126	+ * @NoOutgoingFederatedSharingRequired
	127	+ * @NoIncomingFederatedSharingRequired
	128	+ *
	129	+ * @param string $remote
	130	+ * @return DataResponse
	131	+ */
	132	+ public function testRemote($remote) {
	133	+ if (
	134	+ $this->testUrl('https://' . $remote . '/ocs-provider/') \|\|
	135	+ $this->testUrl('https://' . $remote . '/ocs-provider/index.php') \|\|
	136	+ $this->testUrl('https://' . $remote . '/status.php', true)
	137	+ ) {
	138	+ return new DataResponse('https');
	139	+ } elseif (
	140	+ $this->testUrl('http://' . $remote . '/ocs-provider/') \|\|
	141	+ $this->testUrl('http://' . $remote . '/ocs-provider/index.php') \|\|
	142	+ $this->testUrl('http://' . $remote . '/status.php', true)
	143	+ ) {
	144	+ return new DataResponse('http');
	145	+ } else {
	146	+ return new DataResponse(false);
	147	+ }
	148	+ }
149	149
150	150	}

nextcloud / server

Pull Request — master (#4922)

Status

Category

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

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

Indentation +78 added lines, -78 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 +56 added lines, -56 removed lines patch added patch discarded remove patch

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

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