nextcloud / server

apps/files_trashbin/lib/Command/ExpireTrash.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
 		} else {
 			$p = new ProgressBar($output);
 			$p->start();
-			$this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
+			$this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
 				$p->advance();
 				$this->expireTrashForUser($user);
 			});
@@ -118,7 +118,7 @@ 
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a trashbin directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_trashbin/files')) {
 			return false;
 		}

Indentation +79 added lines, -79 removed lines

@@ -37,93 +37,93 @@
 
 class ExpireTrash extends Command {
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	/**
-	 * @param IUserManager|null $userManager
-	 * @param Expiration|null $expiration
-	 */
-	public function __construct(IUserManager $userManager = null,
-								Expiration $expiration = null) {
-		parent::__construct();
+    /**
+     * @param IUserManager|null $userManager
+     * @param Expiration|null $expiration
+     */
+    public function __construct(IUserManager $userManager = null,
+                                Expiration $expiration = null) {
+        parent::__construct();
 
-		$this->userManager = $userManager;
-		$this->expiration = $expiration;
-	}
+        $this->userManager = $userManager;
+        $this->expiration = $expiration;
+    }
 
-	protected function configure() {
-		$this
-			->setName('trashbin:expire')
-			->setDescription('Expires the users trashbin')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('trashbin:expire')
+            ->setDescription('Expires the users trashbin')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'expires the trashbin of the given user(s), if no user is given the trash for all users will be expired'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			$output->writeln("No expiry configured.");
-			return;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            $output->writeln("No expiry configured.");
+            return;
+        }
 
-		$users = $input->getArgument('user_id');
-		if (!empty($users)) {
-			foreach ($users as $user) {
-				if ($this->userManager->userExists($user)) {
-					$output->writeln("Remove deleted files of   <info>$user</info>");
-					$userObject = $this->userManager->get($user);
-					$this->expireTrashForUser($userObject);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-				}
-			}
-		} else {
-			$p = new ProgressBar($output);
-			$p->start();
-			$this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
-				$p->advance();
-				$this->expireTrashForUser($user);
-			});
-			$p->finish();
-			$output->writeln('');
-		}
-	}
+        $users = $input->getArgument('user_id');
+        if (!empty($users)) {
+            foreach ($users as $user) {
+                if ($this->userManager->userExists($user)) {
+                    $output->writeln("Remove deleted files of   <info>$user</info>");
+                    $userObject = $this->userManager->get($user);
+                    $this->expireTrashForUser($userObject);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                }
+            }
+        } else {
+            $p = new ProgressBar($output);
+            $p->start();
+            $this->userManager->callForSeenUsers(function (IUser $user) use ($p) {
+                $p->advance();
+                $this->expireTrashForUser($user);
+            });
+            $p->finish();
+            $output->writeln('');
+        }
+    }
 
-	public function expireTrashForUser(IUser $user) {
-		$uid = $user->getUID();
-		if (!$this->setupFS($uid)) {
-			return;
-		}
-		$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
-		Trashbin::deleteExpiredFiles($dirContent, $uid);
-	}
+    public function expireTrashForUser(IUser $user) {
+        $uid = $user->getUID();
+        if (!$this->setupFS($uid)) {
+            return;
+        }
+        $dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
+        Trashbin::deleteExpiredFiles($dirContent, $uid);
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a trashbin directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_trashbin/files')) {
-			return false;
-		}
+        // Check if this user has a trashbin directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_trashbin/files')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 			return;
 		}
 
-		$this->userManager->callForSeenUsers(function (IUser $user) {
+		$this->userManager->callForSeenUsers(function(IUser $user) {
 			$uid = $user->getUID();
 			if (!$this->setupFS($uid)) {
 				return;
@@ -100,7 +100,7 @@ 
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a trashbin directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_trashbin/files')) {
 			return false;
 		}

Indentation +63 added lines, -63 removed lines

@@ -36,77 +36,77 @@
 
 class ExpireTrash extends \OC\BackgroundJob\TimedJob {
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	/**
-	 * @param IUserManager|null $userManager
-	 * @param Expiration|null $expiration
-	 */
-	public function __construct(IUserManager $userManager = null,
-								Expiration $expiration = null) {
-		// Run once per 30 minutes
-		$this->setInterval(60 * 30);
+    /**
+     * @param IUserManager|null $userManager
+     * @param Expiration|null $expiration
+     */
+    public function __construct(IUserManager $userManager = null,
+                                Expiration $expiration = null) {
+        // Run once per 30 minutes
+        $this->setInterval(60 * 30);
 
-		if (is_null($expiration) || is_null($userManager)) {
-			$this->fixDIForJobs();
-		} else {
-			$this->userManager = $userManager;
-			$this->expiration = $expiration;
-		}
-	}
+        if (is_null($expiration) || is_null($userManager)) {
+            $this->fixDIForJobs();
+        } else {
+            $this->userManager = $userManager;
+            $this->expiration = $expiration;
+        }
+    }
 
-	protected function fixDIForJobs() {
-		/** @var Application $application */
-		$application = \OC::$server->query(Application::class);
-		$this->userManager = \OC::$server->getUserManager();
-		$this->expiration = $application->getContainer()->query('Expiration');
-	}
+    protected function fixDIForJobs() {
+        /** @var Application $application */
+        $application = \OC::$server->query(Application::class);
+        $this->userManager = \OC::$server->getUserManager();
+        $this->expiration = $application->getContainer()->query('Expiration');
+    }
 
-	/**
-	 * @param $argument
-	 * @throws \Exception
-	 */
-	protected function run($argument) {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			return;
-		}
+    /**
+     * @param $argument
+     * @throws \Exception
+     */
+    protected function run($argument) {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            return;
+        }
 
-		$this->userManager->callForSeenUsers(function (IUser $user) {
-			$uid = $user->getUID();
-			if (!$this->setupFS($uid)) {
-				return;
-			}
-			$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
-			Trashbin::deleteExpiredFiles($dirContent, $uid);
-		});
+        $this->userManager->callForSeenUsers(function (IUser $user) {
+            $uid = $user->getUID();
+            if (!$this->setupFS($uid)) {
+                return;
+            }
+            $dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
+            Trashbin::deleteExpiredFiles($dirContent, $uid);
+        });
 		
-		\OC_Util::tearDownFS();
-	}
+        \OC_Util::tearDownFS();
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a trashbin directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_trashbin/files')) {
-			return false;
-		}
+        // Check if this user has a trashbin directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_trashbin/files')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

apps/comments/lib/Notification/Listener.php

Indentation +77 added lines, -77 removed lines

@@ -27,91 +27,91 @@
 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
-	) {
-		$this->notificationManager = $notificationManager;
-		$this->userManager = $userManager;
-	}
+    /**
+     * Listener constructor.
+     *
+     * @param IManager $notificationManager
+     * @param IUserManager $userManager
+     */
+    public function __construct(
+        IManager $notificationManager,
+        IUserManager $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;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		$notification
 			->setApp('comments')
 			->setObject('comment', $comment->getId())
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
+			->setSubject('mention', [$comment->getObjectType(), $comment->getObjectId()])
 			->setDateTime($comment->getCreationDateTime());
 
 		return $notification;

apps/user_ldap/lib/Command/CreateEmptyConfig.php

Indentation +31 added lines, -31 removed lines

@@ -33,39 +33,39 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class CreateEmptyConfig extends Command {
-	/** @var \OCA\User_LDAP\Helper */
-	protected $helper;
+    /** @var \OCA\User_LDAP\Helper */
+    protected $helper;
 
-	/**
-	 * @param Helper $helper
-	 */
-	public function __construct(Helper $helper) {
-		$this->helper = $helper;
-		parent::__construct();
-	}
+    /**
+     * @param Helper $helper
+     */
+    public function __construct(Helper $helper) {
+        $this->helper = $helper;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('ldap:create-empty-config')
-			->setDescription('creates an empty LDAP configuration')
-			->addOption(
-				'only-print-prefix',
-				'p',
-				InputOption::VALUE_NONE,
-				'outputs only the prefix'
-			)
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:create-empty-config')
+            ->setDescription('creates an empty LDAP configuration')
+            ->addOption(
+                'only-print-prefix',
+                'p',
+                InputOption::VALUE_NONE,
+                'outputs only the prefix'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$configPrefix = $this->helper->getNextServerConfigurationPrefix();
-		$configHolder = new Configuration($configPrefix);
-		$configHolder->saveConfiguration();
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $configPrefix = $this->helper->getNextServerConfigurationPrefix();
+        $configHolder = new Configuration($configPrefix);
+        $configHolder->saveConfiguration();
 
-		$prose = '';
-		if (!$input->getOption('only-print-prefix')) {
-			$prose = 'Created new configuration with configID ';
-		}
-		$output->writeln($prose . "{$configPrefix}");
-	}
+        $prose = '';
+        if (!$input->getOption('only-print-prefix')) {
+            $prose = 'Created new configuration with configID ';
+        }
+        $output->writeln($prose . "{$configPrefix}");
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -66,6 +66,6 @@
 		if (!$input->getOption('only-print-prefix')) {
 			$prose = 'Created new configuration with configID ';
 		}
-		$output->writeln($prose . "{$configPrefix}");
+		$output->writeln($prose."{$configPrefix}");
 	}
 }

apps/user_ldap/lib/Command/DeleteConfig.php

Indentation +29 added lines, -29 removed lines

@@ -32,39 +32,39 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig extends Command {
-	/** @var \OCA\User_LDAP\Helper */
-	protected $helper;
+    /** @var \OCA\User_LDAP\Helper */
+    protected $helper;
 
-	/**
-	 * @param Helper $helper
-	 */
-	public function __construct(Helper $helper) {
-		$this->helper = $helper;
-		parent::__construct();
-	}
+    /**
+     * @param Helper $helper
+     */
+    public function __construct(Helper $helper) {
+        $this->helper = $helper;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('ldap:delete-config')
-			->setDescription('deletes an existing LDAP configuration')
-			->addArgument(
-					'configID',
-					InputArgument::REQUIRED,
-					'the configuration ID'
-					 )
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:delete-config')
+            ->setDescription('deletes an existing LDAP configuration')
+            ->addArgument(
+                    'configID',
+                    InputArgument::REQUIRED,
+                    'the configuration ID'
+                        )
+        ;
+    }
 
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$configPrefix = $input->getArgument('configID');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $configPrefix = $input->getArgument('configID');
 
-		$success = $this->helper->deleteServerConfiguration($configPrefix);
+        $success = $this->helper->deleteServerConfiguration($configPrefix);
 
-		if ($success) {
-			$output->writeln("Deleted configuration with configID '{$configPrefix}'");
-		} else {
-			$output->writeln("Cannot delete configuration with configID '{$configPrefix}'");
-		}
-	}
+        if ($success) {
+            $output->writeln("Deleted configuration with configID '{$configPrefix}'");
+        } else {
+            $output->writeln("Cannot delete configuration with configID '{$configPrefix}'");
+        }
+    }
 }

apps/user_ldap/lib/Migration/UUIDFix.php

Indentation +24 added lines, -24 removed lines

@@ -29,31 +29,31 @@
 use OCA\User_LDAP\User_Proxy;
 
 abstract class UUIDFix extends QueuedJob {
-	/** @var  AbstractMapping */
-	protected $mapper;
+    /** @var  AbstractMapping */
+    protected $mapper;
 
-	/** @var  Proxy */
-	protected $proxy;
+    /** @var  Proxy */
+    protected $proxy;
 
-	public function run($argument) {
-		$isUser = $this->proxy instanceof User_Proxy;
-		foreach ($argument['records'] as $record) {
-			$access = $this->proxy->getLDAPAccess($record['name']);
-			$uuid = $access->getUUID($record['dn'], $isUser);
-			if ($uuid === false) {
-				// record not found, no prob, continue with the next
-				continue;
-			}
-			if ($uuid !== $record['uuid']) {
-				$this->mapper->setUUIDbyDN($uuid, $record['dn']);
-			}
-		}
-	}
+    public function run($argument) {
+        $isUser = $this->proxy instanceof User_Proxy;
+        foreach ($argument['records'] as $record) {
+            $access = $this->proxy->getLDAPAccess($record['name']);
+            $uuid = $access->getUUID($record['dn'], $isUser);
+            if ($uuid === false) {
+                // record not found, no prob, continue with the next
+                continue;
+            }
+            if ($uuid !== $record['uuid']) {
+                $this->mapper->setUUIDbyDN($uuid, $record['dn']);
+            }
+        }
+    }
 
-	/**
-	 * @param Proxy $proxy
-	 */
-	public function overrideProxy(Proxy $proxy) {
-		$this->proxy = $proxy;
-	}
+    /**
+     * @param Proxy $proxy
+     */
+    public function overrideProxy(Proxy $proxy) {
+        $this->proxy = $proxy;
+    }
 }

apps/user_ldap/lib/Mapping/GroupMapping.php

Indentation +7 added lines, -7 removed lines

@@ -29,11 +29,11 @@
  */
 class GroupMapping extends AbstractMapping {
 
-	/**
-	 * returns the DB table name which holds the mappings
-	 * @return string
-	 */
-	protected function getTableName() {
-		return '*PREFIX*ldap_group_mapping';
-	}
+    /**
+     * returns the DB table name which holds the mappings
+     * @return string
+     */
+    protected function getTableName() {
+        return '*PREFIX*ldap_group_mapping';
+    }
 }

apps/user_ldap/lib/Mapping/UserMapping.php

Indentation +7 added lines, -7 removed lines

@@ -29,11 +29,11 @@
  */
 class UserMapping extends AbstractMapping {
 
-	/**
-	 * returns the DB table name which holds the mappings
-	 * @return string
-	 */
-	protected function getTableName() {
-		return '*PREFIX*ldap_user_mapping';
-	}
+    /**
+     * returns the DB table name which holds the mappings
+     * @return string
+     */
+    protected function getTableName() {
+        return '*PREFIX*ldap_user_mapping';
+    }
 }

apps/user_ldap/lib/BackendUtility.php

Indentation +8 added lines, -8 removed lines

@@ -26,13 +26,13 @@
 namespace OCA\User_LDAP;
 
 abstract class BackendUtility {
-	protected $access;
+    protected $access;
 
-	/**
-	 * constructor, make sure the subclasses call this one!
-	 * @param Access $access an instance of Access for LDAP interaction
-	 */
-	public function __construct(Access $access) {
-		$this->access = $access;
-	}
+    /**
+     * constructor, make sure the subclasses call this one!
+     * @param Access $access an instance of Access for LDAP interaction
+     */
+    public function __construct(Access $access) {
+        $this->access = $access;
+    }
 }