nextcloud / server

apps/user_ldap/lib/Jobs/CleanUp.php

Spacing +14 added lines, -15 removed lines

@@ -80,22 +80,22 @@ 
 		//pass in app.php we do add here, except something else is passed e.g.
 		//in tests.
 
-		if(isset($arguments['helper'])) {
+		if (isset($arguments['helper'])) {
 			$this->ldapHelper = $arguments['helper'];
 		} else {
 			$this->ldapHelper = new Helper(\OC::$server->getConfig());
 		}
 
-		if(isset($arguments['ocConfig'])) {
+		if (isset($arguments['ocConfig'])) {
 			$this->ocConfig = $arguments['ocConfig'];
 		} else {
 			$this->ocConfig = \OC::$server->getConfig();
 		}
 
-		if(isset($arguments['userBackend'])) {
+		if (isset($arguments['userBackend'])) {
 			$this->userBackend = $arguments['userBackend'];
 		} else {
-			$this->userBackend =  new User_Proxy(
+			$this->userBackend = new User_Proxy(
 				$this->ldapHelper->getServerConfigurationPrefixes(true),
 				new LDAP(),
 				$this->ocConfig,
@@ -103,19 +103,19 @@ 
 			);
 		}
 
-		if(isset($arguments['db'])) {
+		if (isset($arguments['db'])) {
 			$this->db = $arguments['db'];
 		} else {
 			$this->db = \OC::$server->getDatabaseConnection();
 		}
 
-		if(isset($arguments['mapping'])) {
+		if (isset($arguments['mapping'])) {
 			$this->mapping = $arguments['mapping'];
 		} else {
 			$this->mapping = new UserMapping($this->db);
 		}
 
-		if(isset($arguments['deletedUsersIndex'])) {
+		if (isset($arguments['deletedUsersIndex'])) {
 			$this->dui = $arguments['deletedUsersIndex'];
 		} else {
 			$this->dui = new DeletedUsersIndex(
@@ -130,11 +130,11 @@ 
 	public function run($argument) {
 		$this->setArguments($argument);
 
-		if(!$this->isCleanUpAllowed()) {
+		if (!$this->isCleanUpAllowed()) {
 			return;
 		}
 		$users = $this->mapping->getList($this->getOffset(), $this->limit);
-		if(!is_array($users)) {
+		if (!is_array($users)) {
 			//something wrong? Let's start from the beginning next time and
 			//abort
 			$this->setOffset(true);
@@ -160,7 +160,7 @@ 
 	 */
 	public function isCleanUpAllowed() {
 		try {
-			if($this->ldapHelper->haveDisabledConfigurations()) {
+			if ($this->ldapHelper->haveDisabledConfigurations()) {
 				return false;
 			}
 		} catch (\Exception $e) {
@@ -177,7 +177,7 @@ 
 	 * @return bool
 	 */
 	private function isCleanUpEnabled() {
-		return (bool)$this->ocConfig->getSystemValue(
+		return (bool) $this->ocConfig->getSystemValue(
 			'ldapUserCleanupInterval', strval($this->defaultIntervalMin));
 	}
 
@@ -186,7 +186,7 @@ 
 	 * @param array $users result from getMappedUsers()
 	 */
 	private function checkUsers(array $users) {
-		foreach($users as $user) {
+		foreach ($users as $user) {
 			$this->checkUser($user);
 		}
 	}
@@ -196,7 +196,7 @@ 
 	 * @param string[] $user
 	 */
 	private function checkUser(array $user) {
-		if($this->userBackend->userExistsOnLDAP($user['name'])) {
+		if ($this->userBackend->userExistsOnLDAP($user['name'])) {
 			//still available, all good
 
 			return;
@@ -218,8 +218,7 @@ 
 	 * @param bool $reset whether the offset should be set to 0
 	 */
 	public function setOffset($reset = false) {
-		$newOffset = $reset ? 0 :
-			$this->getOffset() + $this->limit;
+		$newOffset = $reset ? 0 : $this->getOffset() + $this->limit;
 		$this->ocConfig->setAppValue('user_ldap', 'cleanUpJobOffset', $newOffset);
 	}
 

apps/user_ldap/lib/AppInfo/Application.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 use OCP\AppFramework\IAppContainer;
 
 class Application extends App {
-	public function __construct () {
+	public function __construct() {
 		parent::__construct('user_ldap');
 		$container = $this->getContainer();
 

lib/private/Repair/RepairInvalidShares.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
 
 		$updatedEntries = $builder->execute();
 		if ($updatedEntries > 0) {
-			$out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+			$out->info('Fixed file share permissions for '.$updatedEntries.' shares');
 		}
 	}
 
@@ -107,7 +107,7 @@ 
 		}
 
 		if ($deletedEntries) {
-			$out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+			$out->info('Removed '.$deletedEntries.' shares where the parent did not exist');
 		}
 	}
 

apps/dav/lib/CardDAV/AddressBook.php

Spacing +3 added lines, -3 removed lines

@@ -99,7 +99,7 @@ 
 	}
 
 	public function getACL() {
-		$acl =  [
+		$acl = [
 			[
 				'privilege' => '{DAV:}read',
 				'principal' => $this->getOwner(),
@@ -111,7 +111,7 @@ 
 				'protected' => true,
 			];
 		if ($this->getOwner() !== parent::getOwner()) {
-			$acl[] =  [
+			$acl[] = [
 					'privilege' => '{DAV:}read',
 					'principal' => parent::getOwner(),
 					'protected' => true,
@@ -170,7 +170,7 @@ 
 
 	public function delete() {
 		if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
-			$principal = 'principal:' . parent::getOwner();
+			$principal = 'principal:'.parent::getOwner();
 			$shares = $this->carddavBackend->getShares($this->getResourceId());
 			$shares = array_filter($shares, function($share) use ($principal){
 				return $share['href'] === $principal;

lib/private/OCS/Provider.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
 			],
 		];
 
-		if($this->appManager->isEnabledForUser('files_sharing')) {
+		if ($this->appManager->isEnabledForUser('files_sharing')) {
 			$services['SHARING'] = [
 				'version' => 1,
 				'endpoints' => [
@@ -85,7 +85,7 @@ 
 			}
 		}
 
-		if($this->appManager->isEnabledForUser('activity')) {
+		if ($this->appManager->isEnabledForUser('activity')) {
 			$services['ACTIVITY'] = [
 				'version' => 1,
 				'endpoints' => [
@@ -94,7 +94,7 @@ 
 			];
 		}
 
-		if($this->appManager->isEnabledForUser('provisioning_api')) {
+		if ($this->appManager->isEnabledForUser('provisioning_api')) {
 			$services['PROVISIONING'] = [
 				'version' => 1,
 				'endpoints' => [

apps/dav/lib/Connector/Sabre/Principal.php

Spacing +4 added lines, -4 removed lines

@@ -83,7 +83,7 @@ 
 		$principals = [];
 
 		if ($prefixPath === $this->principalPrefix) {
-			foreach($this->userManager->search('') as $user) {
+			foreach ($this->userManager->search('') as $user) {
 				$principals[] = $this->userToPrincipal($user);
 			}
 		}
@@ -150,7 +150,7 @@ 
 				$groups = $this->groupManager->getUserGroups($user);
 				$groups = array_map(function($group) {
 					/** @var IGroup $group */
-					return 'principals/groups/' . urlencode($group->getGID());
+					return 'principals/groups/'.urlencode($group->getGID());
 				}, $groups);
 
 				return $groups;
@@ -201,7 +201,7 @@ 
 			$email = substr($uri, 7);
 			$users = $this->userManager->getByEmail($email);
 			if (count($users) === 1) {
-				return $this->principalPrefix . '/' . $users[0]->getUID();
+				return $this->principalPrefix.'/'.$users[0]->getUID();
 			}
 		}
 
@@ -216,7 +216,7 @@ 
 		$userId = $user->getUID();
 		$displayName = $user->getDisplayName();
 		$principal = [
-				'uri' => $this->principalPrefix . '/' . $userId,
+				'uri' => $this->principalPrefix.'/'.$userId,
 				'{DAV:}displayname' => is_null($displayName) ? $userId : $displayName,
 		];
 

apps/dav/lib/DAV/GroupPrincipalBackend.php

Spacing +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
 		$principals = [];
 
 		if ($prefixPath === self::PRINCIPAL_PREFIX) {
-			foreach($this->groupManager->search('') as $user) {
+			foreach ($this->groupManager->search('') as $user) {
 				$principals[] = $this->groupToPrincipal($user);
 			}
 		}
@@ -76,7 +76,7 @@ 
 	 * @return array
 	 */
 	public function getPrincipalByPath($path) {
-		$elements = explode('/', $path,  3);
+		$elements = explode('/', $path, 3);
 		if ($elements[0] !== 'principals') {
 			return null;
 		}
@@ -179,7 +179,7 @@ 
 	protected function groupToPrincipal($group) {
 		$groupId = $group->getGID();
 		$principal = [
-			'uri' => 'principals/groups/' . urlencode($groupId),
+			'uri' => 'principals/groups/'.urlencode($groupId),
 			'{DAV:}displayname' => $groupId,
 		];
 
@@ -192,7 +192,7 @@ 
 	 */
 	protected function userToPrincipal($user) {
 		$principal = [
-			'uri' => 'principals/users/' . $user->getUID(),
+			'uri' => 'principals/users/'.$user->getUID(),
 			'{DAV:}displayname' => $user->getDisplayName(),
 		];
 

lib/private/legacy/json.php

Spacing +19 added lines, -19 removed lines

@@ -34,16 +34,16 @@ 
  * Class OC_JSON
  * @deprecated Use a AppFramework JSONResponse instead
  */
-class OC_JSON{
+class OC_JSON {
 	static protected $send_content_type_header = false;
 	/**
 	 * set Content-Type header to jsonrequest
 	 * @deprecated Use a AppFramework JSONResponse instead
 	 */
-	public static function setContentTypeHeader($type='application/json') {
+	public static function setContentTypeHeader($type = 'application/json') {
 		if (!self::$send_content_type_header) {
 			// We send json data
-			header( 'Content-Type: '.$type . '; charset=utf-8');
+			header('Content-Type: '.$type.'; charset=utf-8');
 			self::$send_content_type_header = true;
 		}
 	}
@@ -54,9 +54,9 @@ 
 	 * @deprecated Use the AppFramework instead. It will automatically check if the app is enabled.
 	 */
 	public static function checkAppEnabled($app) {
-		if( !OC_App::isEnabled($app)) {
+		if (!OC_App::isEnabled($app)) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled' )));
+			self::error(array('data' => array('message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled')));
 			exit();
 		}
 	}
@@ -67,11 +67,11 @@ 
 	 */
 	public static function checkLoggedIn() {
 		$twoFactorAuthManger = \OC::$server->getTwoFactorAuthManager();
-		if( !\OC::$server->getUserSession()->isLoggedIn()
+		if (!\OC::$server->getUserSession()->isLoggedIn()
 			|| $twoFactorAuthManger->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
 			$l = \OC::$server->getL10N('lib');
 			http_response_code(\OCP\AppFramework\Http::STATUS_UNAUTHORIZED);
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+			self::error(array('data' => array('message' => $l->t('Authentication error'), 'error' => 'authentication_error')));
 			exit();
 		}
 	}
@@ -81,14 +81,14 @@ 
 	 * @deprecated Use annotation based CSRF checks from the AppFramework instead
 	 */
 	public static function callCheck() {
-		if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
+		if (!\OC::$server->getRequest()->passesStrictCookieCheck()) {
 			header('Location: '.\OC::$WEBROOT);
 			exit();
 		}
 
-		if( !(\OC::$server->getRequest()->passesCSRFCheck())) {
+		if (!(\OC::$server->getRequest()->passesCSRFCheck())) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired' )));
+			self::error(array('data' => array('message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired')));
 			exit();
 		}
 	}
@@ -98,9 +98,9 @@ 
 	 * @deprecated Use annotation based ACLs from the AppFramework instead
 	 */
 	public static function checkAdminUser() {
-		if( !OC_User::isAdminUser(OC_User::getUser())) {
+		if (!OC_User::isAdminUser(OC_User::getUser())) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+			self::error(array('data' => array('message' => $l->t('Authentication error'), 'error' => 'authentication_error')));
 			exit();
 		}
 	}
@@ -113,7 +113,7 @@ 
 	public static function checkUserExists($user) {
 		if (!OCP\User::userExists($user)) {
 			$l = \OC::$server->getL10N('lib');
-			OCP\JSON::error(array('data' => array('message' => $l->t('Unknown user'), 'error' => 'unknown_user' )));
+			OCP\JSON::error(array('data' => array('message' => $l->t('Unknown user'), 'error' => 'unknown_user')));
 			exit;
 		}
 	}
@@ -126,13 +126,13 @@ 
 	public static function checkSubAdminUser() {
 		$userObject = \OC::$server->getUserSession()->getUser();
 		$isSubAdmin = false;
-		if($userObject !== null) {
+		if ($userObject !== null) {
 			$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
 		}
 
-		if(!$isSubAdmin) {
+		if (!$isSubAdmin) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+			self::error(array('data' => array('message' => $l->t('Authentication error'), 'error' => 'authentication_error')));
 			exit();
 		}
 	}
@@ -160,7 +160,7 @@ 
 	 */
 	protected static function to_string(&$value) {
 		if ($value instanceof OC_L10N_String) {
-			$value = (string)$value;
+			$value = (string) $value;
 		}
 	}
 
@@ -168,8 +168,8 @@ 
 	 * Encode and print $data in json format
 	 * @deprecated Use a AppFramework JSONResponse instead
 	 */
-	public static function encodedPrint($data, $setContentType=true) {
-		if($setContentType) {
+	public static function encodedPrint($data, $setContentType = true) {
+		if ($setContentType) {
 			self::setContentTypeHeader();
 		}
 		echo self::encode($data);

apps/comments/lib/Notification/Notifier.php

Spacing +7 added lines, -7 removed lines

@@ -68,34 +68,34 @@
 	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
 	 */
 	public function prepare(INotification $notification, $languageCode) {
-		if($notification->getApp() !== 'comments') {
+		if ($notification->getApp() !== 'comments') {
 			throw new \InvalidArgumentException();
 		}
 		try {
 			$comment = $this->commentsManager->get($notification->getObjectId());
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			// needs to be converted to InvalidArgumentException, otherwise none Notifications will be shown at all
 			throw new \InvalidArgumentException('Comment not found', 0, $e);
 		}
 		$l = $this->l10nFactory->get('comments', $languageCode);
 		$displayName = $comment->getActorId();
 		$isDeletedActor = $comment->getActorType() === ICommentsManager::DELETED_USER;
-		if($comment->getActorType() === 'users') {
+		if ($comment->getActorType() === 'users') {
 			$commenter = $this->userManager->get($comment->getActorId());
-			if(!is_null($commenter)) {
+			if (!is_null($commenter)) {
 				$displayName = $commenter->getDisplayName();
 			}
 		}
 
-		switch($notification->getSubject()) {
+		switch ($notification->getSubject()) {
 			case 'mention':
 				$parameters = $notification->getSubjectParameters();
-				if($parameters[0] !== 'files') {
+				if ($parameters[0] !== 'files') {
 					throw new \InvalidArgumentException('Unsupported comment object');
 				}
 				$userFolder = $this->rootFolder->getUserFolder($notification->getUser());
 				$nodes = $userFolder->getById($parameters[1]);
-				if(empty($nodes)) {
+				if (empty($nodes)) {
 					throw new \InvalidArgumentException('Cannot resolve file id to Node instance');
 				}
 				$node = $nodes[0];