nextcloud / server

apps/files_sharing/lib/Activity/Providers/Base.php

Indentation +149 added lines, -149 removed lines

@@ -32,153 +32,153 @@
 
 abstract class Base implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var array */
-	protected $displayNames = [];
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'files_sharing') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('files_sharing', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	abstract protected function parseShortVersion(IEvent $event);
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	abstract protected function parseLongVersion(IEvent $event);
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 */
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'file') {
-				$replacements[] = $parameter['path'];
-			} else {
-				$replacements[] = $parameter['name'];
-			}
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param array|string $parameter
-	 * @param IEvent|null $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getFile($parameter, IEvent $event = null) {
-		if (is_array($parameter)) {
-			$path = reset($parameter);
-			$id = (string) key($parameter);
-		} else if ($event !== null) {
-			// Legacy from before ownCloud 8.2
-			$path = $parameter;
-			$id = $event->getObjectId();
-		} else {
-			throw new \InvalidArgumentException('Could not generate file parameter');
-		}
-
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function getUser($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var array */
+    protected $displayNames = [];
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'files_sharing') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('files_sharing', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    abstract protected function parseShortVersion(IEvent $event);
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    abstract protected function parseLongVersion(IEvent $event);
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     */
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'file') {
+                $replacements[] = $parameter['path'];
+            } else {
+                $replacements[] = $parameter['name'];
+            }
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param array|string $parameter
+     * @param IEvent|null $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getFile($parameter, IEvent $event = null) {
+        if (is_array($parameter)) {
+            $path = reset($parameter);
+            $id = (string) key($parameter);
+        } else if ($event !== null) {
+            // Legacy from before ownCloud 8.2
+            $path = $parameter;
+            $id = $event->getObjectId();
+        } else {
+            throw new \InvalidArgumentException('Could not generate file parameter');
+        }
+
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function getUser($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        } else {
+            return $uid;
+        }
+    }
 }

apps/files_sharing/lib/Activity/Providers/PublicLinks.php

Indentation +92 added lines, -92 removed lines

@@ -25,97 +25,97 @@
 
 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 [];
+    }
 
 }

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

Indentation +112 added lines, -112 removed lines

@@ -32,116 +32,116 @@
 
 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(),
+        ];
+    }
 }

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

Indentation +78 added lines, -78 removed lines

@@ -25,92 +25,92 @@
 
 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 [];
+    }
 }

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

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 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;
+    }
 }
 

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

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 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;
+    }
 }
 

apps/files_sharing/lib/Activity/Settings/RemoteShare.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 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;
+    }
 }
 

apps/files_sharing/lib/Activity/Filter.php

Indentation +56 added lines, -56 removed lines

@@ -27,69 +27,69 @@
 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'];
+    }
 }

apps/files_sharing/lib/ExpireSharesJob.php

Indentation +38 added lines, -38 removed lines

@@ -29,49 +29,49 @@
  */
 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();
+    }
 
 }