nextcloud / server

apps/encryption/lib/HookManager.php

Indentation +29 added lines, -29 removed lines

@@ -28,38 +28,38 @@
 
 class HookManager {
 
-	private $hookInstances = [];
+    private $hookInstances = [];
 
-	/**
-	 * @param array|IHook $instances
-	 *        - This accepts either a single instance of IHook or an array of instances of IHook
-	 * @return bool
-	 */
-	public function registerHook($instances) {
-		if (is_array($instances)) {
-			foreach ($instances as $instance) {
-				if (!$instance instanceof IHook) {
-					return false;
-				}
-				$this->hookInstances[] = $instance;
-			}
+    /**
+     * @param array|IHook $instances
+     *        - This accepts either a single instance of IHook or an array of instances of IHook
+     * @return bool
+     */
+    public function registerHook($instances) {
+        if (is_array($instances)) {
+            foreach ($instances as $instance) {
+                if (!$instance instanceof IHook) {
+                    return false;
+                }
+                $this->hookInstances[] = $instance;
+            }
 
-		} elseif ($instances instanceof IHook) {
-			$this->hookInstances[] = $instances;
-		}
-		return true;
-	}
+        } elseif ($instances instanceof IHook) {
+            $this->hookInstances[] = $instances;
+        }
+        return true;
+    }
 
-	public function fireHooks() {
-		foreach ($this->hookInstances as $instance) {
-			/**
-			 * Fire off the add hooks method of each instance stored in cache
-			 *
-			 * @var $instance IHook
-			 */
-			$instance->addHooks();
-		}
+    public function fireHooks() {
+        foreach ($this->hookInstances as $instance) {
+            /**
+             * Fire off the add hooks method of each instance stored in cache
+             *
+             * @var $instance IHook
+             */
+            $instance->addHooks();
+        }
 
-	}
+    }
 
 }

apps/encryption/appinfo/routes.php

Indentation +30 added lines, -30 removed lines

@@ -26,36 +26,36 @@
 
 (new Application())->registerRoutes($this, array('routes' => array(
 
-	[
-		'name' => 'Recovery#adminRecovery',
-		'url' => '/ajax/adminRecovery',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Settings#updatePrivateKeyPassword',
-		'url' => '/ajax/updatePrivateKeyPassword',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Settings#setEncryptHomeStorage',
-		'url' => '/ajax/setEncryptHomeStorage',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Recovery#changeRecoveryPassword',
-		'url' => '/ajax/changeRecoveryPassword',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Recovery#userSetRecovery',
-		'url' => '/ajax/userSetRecovery',
-		'verb' => 'POST'
-	],
-	[
-		'name' => 'Status#getStatus',
-		'url' => '/ajax/getStatus',
-		'verb' => 'GET'
-	]
+    [
+        'name' => 'Recovery#adminRecovery',
+        'url' => '/ajax/adminRecovery',
+        'verb' => 'POST'
+    ],
+    [
+        'name' => 'Settings#updatePrivateKeyPassword',
+        'url' => '/ajax/updatePrivateKeyPassword',
+        'verb' => 'POST'
+    ],
+    [
+        'name' => 'Settings#setEncryptHomeStorage',
+        'url' => '/ajax/setEncryptHomeStorage',
+        'verb' => 'POST'
+    ],
+    [
+        'name' => 'Recovery#changeRecoveryPassword',
+        'url' => '/ajax/changeRecoveryPassword',
+        'verb' => 'POST'
+    ],
+    [
+        'name' => 'Recovery#userSetRecovery',
+        'url' => '/ajax/userSetRecovery',
+        'verb' => 'POST'
+    ],
+    [
+        'name' => 'Status#getStatus',
+        'url' => '/ajax/getStatus',
+        'verb' => 'GET'
+    ]
 
 
 )));

apps/encryption/appinfo/app.php

Indentation +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@
 
 $app = new Application([], $encryptionSystemReady);
 if ($encryptionSystemReady) {
-	$app->registerEncryptionModule();
-	$app->registerHooks();
-	$app->registerSettings();
+    $app->registerEncryptionModule();
+    $app->registerHooks();
+    $app->registerSettings();
 }

apps/encryption/settings/settings-personal.php

Indentation +21 added lines, -21 removed lines

@@ -27,26 +27,26 @@ 
 
 $template = new OCP\Template('encryption', 'settings-personal');
 $crypt = new \OCA\Encryption\Crypto\Crypt(
-	\OC::$server->getLogger(),
-	$userSession,
-	\OC::$server->getConfig(),
-	\OC::$server->getL10N('encryption'));
+    \OC::$server->getLogger(),
+    $userSession,
+    \OC::$server->getConfig(),
+    \OC::$server->getL10N('encryption'));
 
 $util = new \OCA\Encryption\Util(
-	new \OC\Files\View(),
-	$crypt,
-	\OC::$server->getLogger(),
-	$userSession,
-	\OC::$server->getConfig(),
-	\OC::$server->getUserManager());
+    new \OC\Files\View(),
+    $crypt,
+    \OC::$server->getLogger(),
+    $userSession,
+    \OC::$server->getConfig(),
+    \OC::$server->getUserManager());
 
 $keyManager = new \OCA\Encryption\KeyManager(
-	\OC::$server->getEncryptionKeyStorage(),
-	$crypt,
-	\OC::$server->getConfig(),
-	$userSession,
-	$session,
-	\OC::$server->getLogger(), $util);
+    \OC::$server->getEncryptionKeyStorage(),
+    $crypt,
+    \OC::$server->getConfig(),
+    $userSession,
+    $session,
+    \OC::$server->getLogger(), $util);
 
 $user = $userSession->getUser()->getUID();
 
@@ -64,12 +64,12 @@ 
 $result = false;
 
 if ($recoveryAdminEnabled || !$privateKeySet) {
-	$template->assign('recoveryEnabled', $recoveryAdminEnabled);
-	$template->assign('recoveryEnabledForUser', $recoveryEnabledForUser);
-	$template->assign('privateKeySet', $privateKeySet);
-	$template->assign('initialized', $initialized);
+    $template->assign('recoveryEnabled', $recoveryAdminEnabled);
+    $template->assign('recoveryEnabledForUser', $recoveryEnabledForUser);
+    $template->assign('privateKeySet', $privateKeySet);
+    $template->assign('initialized', $initialized);
 
-	$result = $template->fetchPage();
+    $result = $template->fetchPage();
 }
 
 return $result;

apps/comments/lib/Activity/Setting.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class Setting 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 'comments';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'comments';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('<strong>Comments</strong> for files');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('<strong>Comments</strong> for files');
+    }
 
-	/**
-	 * @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 50;
-	}
+    /**
+     * @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 50;
+    }
 
-	/**
-	 * @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/comments/lib/Activity/Filter.php

Indentation +51 added lines, -51 removed lines

@@ -28,63 +28,63 @@
 
 class Filter implements IFilter {
 
-	/** @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 'comments';
-	}
+    /**
+     * @return string Lowercase a-z only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'comments';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('Comments');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('Comments');
+    }
 
-	/**
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 40;
-	}
+    /**
+     * @return int
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 40;
+    }
 
-	/**
-	 * @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/comment.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/comment.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 $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 $types;
+    }
 
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return ['comments'];
-	}
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return ['comments'];
+    }
 }

apps/comments/lib/Notification/Listener.php

Indentation +78 added lines, -78 removed lines

@@ -27,93 +27,93 @@
 use OCP\Notification\IManager;
 
 class Listener {
-	/** @var IManager */
-	protected $notificationManager;
+    /** @var IManager */
+    protected $notificationManager;
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/**
-	 * Listener constructor.
-	 *
-	 * @param IManager $notificationManager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(
-		IManager $notificationManager,
-		IUserManager $userManager
-	) {
+    /**
+     * Listener constructor.
+     *
+     * @param IManager $notificationManager
+     * @param IUserManager $userManager
+     */
+    public function __construct(
+        IManager $notificationManager,
+        IUserManager $userManager
+    ) {
 
-		$this->notificationManager = $notificationManager;
-		$this->userManager = $userManager;
-	}
+        $this->notificationManager = $notificationManager;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	public function evaluate(CommentsEvent $event) {
-		$comment = $event->getComment();
+    /**
+     * @param CommentsEvent $event
+     */
+    public function evaluate(CommentsEvent $event) {
+        $comment = $event->getComment();
 
-		$mentions = $this->extractMentions($comment->getMentions());
-		if(empty($mentions)) {
-			// no one to notify
-			return;
-		}
+        $mentions = $this->extractMentions($comment->getMentions());
+        if(empty($mentions)) {
+            // no one to notify
+            return;
+        }
 
-		$notification = $this->instantiateNotification($comment);
+        $notification = $this->instantiateNotification($comment);
 
-		foreach($mentions as $uid) {
-			if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId())
-				|| !$this->userManager->userExists($uid)
-			) {
-				// do not notify unknown users or yourself
-				continue;
-			}
+        foreach($mentions as $uid) {
+            if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId())
+                || !$this->userManager->userExists($uid)
+            ) {
+                // do not notify unknown users or yourself
+                continue;
+            }
 
-			$notification->setUser($uid);
-			if(    $event->getEvent() === CommentsEvent::EVENT_DELETE
-				|| $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
-			{
-				$this->notificationManager->markProcessed($notification);
-			} else {
-				$this->notificationManager->notify($notification);
-			}
-		}
-	}
+            $notification->setUser($uid);
+            if(    $event->getEvent() === CommentsEvent::EVENT_DELETE
+                || $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
+            {
+                $this->notificationManager->markProcessed($notification);
+            } else {
+                $this->notificationManager->notify($notification);
+            }
+        }
+    }
 
-	/**
-	 * creates a notification instance and fills it with comment data
-	 *
-	 * @param IComment $comment
-	 * @return \OCP\Notification\INotification
-	 */
-	public function instantiateNotification(IComment $comment) {
-		$notification = $this->notificationManager->createNotification();
-		$notification
-			->setApp('comments')
-			->setObject('comment', $comment->getId())
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
-			->setDateTime($comment->getCreationDateTime());
+    /**
+     * creates a notification instance and fills it with comment data
+     *
+     * @param IComment $comment
+     * @return \OCP\Notification\INotification
+     */
+    public function instantiateNotification(IComment $comment) {
+        $notification = $this->notificationManager->createNotification();
+        $notification
+            ->setApp('comments')
+            ->setObject('comment', $comment->getId())
+            ->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
+            ->setDateTime($comment->getCreationDateTime());
 
-		return $notification;
-	}
+        return $notification;
+    }
 
-	/**
-	 * flattens the mention array returned from comments to a list of user ids.
-	 *
-	 * @param array $mentions
-	 * @return string[] containing the mentions, e.g. ['alice', 'bob']
-	 */
-	public function extractMentions(array $mentions) {
-		if(empty($mentions)) {
-			return [];
-		}
-		$uids = [];
-		foreach($mentions as $mention) {
-			if($mention['type'] === 'user') {
-				$uids[] = $mention['id'];
-			}
-		}
-		return $uids;
-	}
+    /**
+     * flattens the mention array returned from comments to a list of user ids.
+     *
+     * @param array $mentions
+     * @return string[] containing the mentions, e.g. ['alice', 'bob']
+     */
+    public function extractMentions(array $mentions) {
+        if(empty($mentions)) {
+            return [];
+        }
+        $uids = [];
+        foreach($mentions as $mention) {
+            if($mention['type'] === 'user') {
+                $uids[] = $mention['id'];
+            }
+        }
+        return $uids;
+    }
 }

apps/comments/lib/Controller/Notifications.php

Indentation +81 added lines, -81 removed lines

@@ -40,95 +40,95 @@
  * @package OCA\Comments\Controller
  */
 class Notifications extends Controller {
-	/** @var Folder  */
-	protected $folder;
+    /** @var Folder  */
+    protected $folder;
 
-	/** @var ICommentsManager  */
-	protected $commentsManager;
+    /** @var ICommentsManager  */
+    protected $commentsManager;
 
-	/** @var IURLGenerator  */
-	protected $urlGenerator;
+    /** @var IURLGenerator  */
+    protected $urlGenerator;
 
-	/** @var IManager  */
-	protected $notificationManager;
+    /** @var IManager  */
+    protected $notificationManager;
 
-	/** @var IUserSession  */
-	protected $userSession;
+    /** @var IUserSession  */
+    protected $userSession;
 
-	/**
-	 * Notifications constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ICommentsManager $commentsManager
-	 * @param Folder $folder
-	 * @param IURLGenerator $urlGenerator
-	 * @param IManager $notificationManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		ICommentsManager $commentsManager,
-		Folder $folder,
-		IURLGenerator $urlGenerator,
-		IManager $notificationManager,
-		IUserSession $userSession
-	) {
-		parent::__construct($appName, $request);
-		$this->commentsManager = $commentsManager;
-		$this->folder = $folder;
-		$this->urlGenerator = $urlGenerator;
-		$this->notificationManager = $notificationManager;
-		$this->userSession = $userSession;
-	}
+    /**
+     * Notifications constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param ICommentsManager $commentsManager
+     * @param Folder $folder
+     * @param IURLGenerator $urlGenerator
+     * @param IManager $notificationManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        ICommentsManager $commentsManager,
+        Folder $folder,
+        IURLGenerator $urlGenerator,
+        IManager $notificationManager,
+        IUserSession $userSession
+    ) {
+        parent::__construct($appName, $request);
+        $this->commentsManager = $commentsManager;
+        $this->folder = $folder;
+        $this->urlGenerator = $urlGenerator;
+        $this->notificationManager = $notificationManager;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $id		the comment ID
-	 * @return Response
-	 */
-	public function view($id) {
-		try {
-			$comment = $this->commentsManager->get($id);
-			if($comment->getObjectType() !== 'files') {
-				return new NotFoundResponse();
-			}
-			$files = $this->folder->getById($comment->getObjectId());
-			if(count($files) === 0) {
-				$this->markProcessed($comment);
-				return new NotFoundResponse();
-			}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $id		the comment ID
+     * @return Response
+     */
+    public function view($id) {
+        try {
+            $comment = $this->commentsManager->get($id);
+            if($comment->getObjectType() !== 'files') {
+                return new NotFoundResponse();
+            }
+            $files = $this->folder->getById($comment->getObjectId());
+            if(count($files) === 0) {
+                $this->markProcessed($comment);
+                return new NotFoundResponse();
+            }
 
-			$url = $this->urlGenerator->linkToRouteAbsolute(
-				'files.viewcontroller.showFile',
-				[ 'fileid' => $comment->getObjectId() ]
-			);
+            $url = $this->urlGenerator->linkToRouteAbsolute(
+                'files.viewcontroller.showFile',
+                [ 'fileid' => $comment->getObjectId() ]
+            );
 
-			$this->markProcessed($comment);
+            $this->markProcessed($comment);
 
-			return new RedirectResponse($url);
-		} catch (\Exception $e) {
-			return new NotFoundResponse();
-		}
-	}
+            return new RedirectResponse($url);
+        } catch (\Exception $e) {
+            return new NotFoundResponse();
+        }
+    }
 
-	/**
-	 * Marks the notification about a comment as processed
-	 * @param IComment $comment
-	 */
-	protected function markProcessed(IComment $comment) {
-		$user = $this->userSession->getUser();
-		if(is_null($user)) {
-			return;
-		}
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('comments')
-			->setObject('comment', $comment->getId())
-			->setSubject('mention')
-			->setUser($user->getUID());
-		$this->notificationManager->markProcessed($notification);
-	}
+    /**
+     * Marks the notification about a comment as processed
+     * @param IComment $comment
+     */
+    protected function markProcessed(IComment $comment) {
+        $user = $this->userSession->getUser();
+        if(is_null($user)) {
+            return;
+        }
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('comments')
+            ->setObject('comment', $comment->getId())
+            ->setSubject('mention')
+            ->setUser($user->getUID());
+        $this->notificationManager->markProcessed($notification);
+    }
 }

apps/comments/lib/AppInfo/Application.php

Indentation +5 added lines, -5 removed lines

@@ -26,10 +26,10 @@
 
 class Application extends App {
 
-	public function __construct (array $urlParams = array()) {
-		parent::__construct('comments', $urlParams);
-		$container = $this->getContainer();
+    public function __construct (array $urlParams = array()) {
+        parent::__construct('comments', $urlParams);
+        $container = $this->getContainer();
 
-		$container->registerAlias('NotificationsController', Notifications::class);
-	}
+        $container->registerAlias('NotificationsController', Notifications::class);
+    }
 }