nextcloud / server

lib/private/Share20/LegacyHooks.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 		/** @var IShare[] $deletedShares */
 		$deletedShares = $e->getArgument('deletedShares');
 
-		$formattedDeletedShares = array_map(function ($share) {
+		$formattedDeletedShares = array_map(function($share) {
 			return $this->formatHookParams($share);
 		}, $deletedShares);
 

Indentation +141 added lines, -141 removed lines

@@ -34,145 +34,145 @@
 
 class LegacyHooks {
 
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
-
-	/**
-	 * LegacyHooks constructor.
-	 *
-	 * @param EventDispatcherInterface $eventDispatcher
-	 */
-	public function __construct(EventDispatcherInterface $eventDispatcher) {
-		$this->eventDispatcher = $eventDispatcher;
-
-		$this->eventDispatcher->addListener('OCP\Share::preUnshare', [$this, 'preUnshare']);
-		$this->eventDispatcher->addListener('OCP\Share::postUnshare', [$this, 'postUnshare']);
-		$this->eventDispatcher->addListener('OCP\Share::postUnshareFromSelf', [$this, 'postUnshareFromSelf']);
-		$this->eventDispatcher->addListener('OCP\Share::preShare', [$this, 'preShare']);
-		$this->eventDispatcher->addListener('OCP\Share::postShare', [$this, 'postShare']);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function preUnshare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-		\OC_Hook::emit(Share::class, 'pre_unshare', $formatted);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function postUnshare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-
-		/** @var IShare[] $deletedShares */
-		$deletedShares = $e->getArgument('deletedShares');
-
-		$formattedDeletedShares = array_map(function ($share) {
-			return $this->formatHookParams($share);
-		}, $deletedShares);
-
-		$formatted['deletedShares'] = $formattedDeletedShares;
-
-		\OC_Hook::emit(Share::class, 'post_unshare', $formatted);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function postUnshareFromSelf(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-		$formatted['itemTarget'] = $formatted['fileTarget'];
-		$formatted['unsharedItems'] = [$formatted];
-
-		\OC_Hook::emit(Share::class, 'post_unshareFromSelf', $formatted);
-	}
-
-	private function formatHookParams(IShare $share) {
-		// Prepare hook
-		$shareType = $share->getShareType();
-		$sharedWith = '';
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
-			$shareType === \OCP\Share::SHARE_TYPE_GROUP ||
-			$shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
-			$sharedWith = $share->getSharedWith();
-		}
-
-		$hookParams = [
-			'id' => $share->getId(),
-			'itemType' => $share->getNodeType(),
-			'itemSource' => $share->getNodeId(),
-			'shareType' => $shareType,
-			'shareWith' => $sharedWith,
-			'itemparent' => method_exists($share, 'getParent') ? $share->getParent() : '',
-			'uidOwner' => $share->getSharedBy(),
-			'fileSource' => $share->getNodeId(),
-			'fileTarget' => $share->getTarget()
-		];
-		return $hookParams;
-	}
-
-	public function preShare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		// Pre share hook
-		$run = true;
-		$error = '';
-		$preHookData = [
-			'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
-			'itemSource' => $share->getNode()->getId(),
-			'shareType' => $share->getShareType(),
-			'uidOwner' => $share->getSharedBy(),
-			'permissions' => $share->getPermissions(),
-			'fileSource' => $share->getNode()->getId(),
-			'expiration' => $share->getExpirationDate(),
-			'token' => $share->getToken(),
-			'itemTarget' => $share->getTarget(),
-			'shareWith' => $share->getSharedWith(),
-			'run' => &$run,
-			'error' => &$error,
-		];
-		\OC_Hook::emit(Share::class, 'pre_shared', $preHookData);
-
-		if ($run === false) {
-			$e->setArgument('error', $error);
-			$e->stopPropagation();
-		}
-
-		return $e;
-	}
-
-	public function postShare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$postHookData = [
-			'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
-			'itemSource' => $share->getNode()->getId(),
-			'shareType' => $share->getShareType(),
-			'uidOwner' => $share->getSharedBy(),
-			'permissions' => $share->getPermissions(),
-			'fileSource' => $share->getNode()->getId(),
-			'expiration' => $share->getExpirationDate(),
-			'token' => $share->getToken(),
-			'id' => $share->getId(),
-			'shareWith' => $share->getSharedWith(),
-			'itemTarget' => $share->getTarget(),
-			'fileTarget' => $share->getTarget(),
-		];
-
-		\OC_Hook::emit(Share::class, 'post_shared', $postHookData);
-
-	}
+    /** @var EventDispatcherInterface */
+    private $eventDispatcher;
+
+    /**
+     * LegacyHooks constructor.
+     *
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(EventDispatcherInterface $eventDispatcher) {
+        $this->eventDispatcher = $eventDispatcher;
+
+        $this->eventDispatcher->addListener('OCP\Share::preUnshare', [$this, 'preUnshare']);
+        $this->eventDispatcher->addListener('OCP\Share::postUnshare', [$this, 'postUnshare']);
+        $this->eventDispatcher->addListener('OCP\Share::postUnshareFromSelf', [$this, 'postUnshareFromSelf']);
+        $this->eventDispatcher->addListener('OCP\Share::preShare', [$this, 'preShare']);
+        $this->eventDispatcher->addListener('OCP\Share::postShare', [$this, 'postShare']);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function preUnshare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+        \OC_Hook::emit(Share::class, 'pre_unshare', $formatted);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function postUnshare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+
+        /** @var IShare[] $deletedShares */
+        $deletedShares = $e->getArgument('deletedShares');
+
+        $formattedDeletedShares = array_map(function ($share) {
+            return $this->formatHookParams($share);
+        }, $deletedShares);
+
+        $formatted['deletedShares'] = $formattedDeletedShares;
+
+        \OC_Hook::emit(Share::class, 'post_unshare', $formatted);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function postUnshareFromSelf(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+        $formatted['itemTarget'] = $formatted['fileTarget'];
+        $formatted['unsharedItems'] = [$formatted];
+
+        \OC_Hook::emit(Share::class, 'post_unshareFromSelf', $formatted);
+    }
+
+    private function formatHookParams(IShare $share) {
+        // Prepare hook
+        $shareType = $share->getShareType();
+        $sharedWith = '';
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
+            $shareType === \OCP\Share::SHARE_TYPE_GROUP ||
+            $shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
+            $sharedWith = $share->getSharedWith();
+        }
+
+        $hookParams = [
+            'id' => $share->getId(),
+            'itemType' => $share->getNodeType(),
+            'itemSource' => $share->getNodeId(),
+            'shareType' => $shareType,
+            'shareWith' => $sharedWith,
+            'itemparent' => method_exists($share, 'getParent') ? $share->getParent() : '',
+            'uidOwner' => $share->getSharedBy(),
+            'fileSource' => $share->getNodeId(),
+            'fileTarget' => $share->getTarget()
+        ];
+        return $hookParams;
+    }
+
+    public function preShare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        // Pre share hook
+        $run = true;
+        $error = '';
+        $preHookData = [
+            'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
+            'itemSource' => $share->getNode()->getId(),
+            'shareType' => $share->getShareType(),
+            'uidOwner' => $share->getSharedBy(),
+            'permissions' => $share->getPermissions(),
+            'fileSource' => $share->getNode()->getId(),
+            'expiration' => $share->getExpirationDate(),
+            'token' => $share->getToken(),
+            'itemTarget' => $share->getTarget(),
+            'shareWith' => $share->getSharedWith(),
+            'run' => &$run,
+            'error' => &$error,
+        ];
+        \OC_Hook::emit(Share::class, 'pre_shared', $preHookData);
+
+        if ($run === false) {
+            $e->setArgument('error', $error);
+            $e->stopPropagation();
+        }
+
+        return $e;
+    }
+
+    public function postShare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $postHookData = [
+            'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
+            'itemSource' => $share->getNode()->getId(),
+            'shareType' => $share->getShareType(),
+            'uidOwner' => $share->getSharedBy(),
+            'permissions' => $share->getPermissions(),
+            'fileSource' => $share->getNode()->getId(),
+            'expiration' => $share->getExpirationDate(),
+            'token' => $share->getToken(),
+            'id' => $share->getId(),
+            'shareWith' => $share->getSharedWith(),
+            'itemTarget' => $share->getTarget(),
+            'fileTarget' => $share->getTarget(),
+        ];
+
+        \OC_Hook::emit(Share::class, 'post_shared', $postHookData);
+
+    }
 }

lib/private/AppConfig.php

Spacing +1 added lines, -1 removed lines

@@ -275,7 +275,7 @@
 			return $this->getAppValues($app);
 		} else {
 			$appIds = $this->getApps();
-			$values = array_map(function ($appId) use ($key) {
+			$values = array_map(function($appId) use ($key) {
 				return isset($this->cache[$appId][$key]) ? $this->cache[$appId][$key] : null;
 			}, $appIds);
 			$result = array_combine($appIds, $values);

Indentation +296 added lines, -296 removed lines

@@ -42,304 +42,304 @@
  */
 class AppConfig implements IAppConfig {
 
-	/** @var array[] */
-	protected $sensitiveValues = [
-		'external' => [
-			'/^sites$/',
-		],
-		'spreed' => [
-			'/^signaling_ticket_secret$/',
-			'/^turn_server_secret$/',
-			'/^stun_servers$/',
-			'/^turn_servers$/',
-			'/^signaling_servers$/',
-		],
-		'theming' => [
-			'/^imprintUrl$/',
-			'/^privacyUrl$/',
-			'/^slogan$/',
-			'/^url$/',
-		],
-		'user_ldap' => [
-			'/^(s..)?ldap_agent_password$/',
-		],
-	];
-
-	/** @var \OCP\IDBConnection */
-	protected $conn;
-
-	/** @var array[] */
-	private $cache = [];
-
-	/** @var bool */
-	private $configLoaded = false;
-
-	/**
-	 * @param IDBConnection $conn
-	 */
-	public function __construct(IDBConnection $conn) {
-		$this->conn = $conn;
-		$this->configLoaded = false;
-	}
-
-	/**
-	 * @param string $app
-	 * @return array
-	 */
-	private function getAppValues($app) {
-		$this->loadConfigValues();
-
-		if (isset($this->cache[$app])) {
-			return $this->cache[$app];
-		}
-
-		return [];
-	}
-
-	/**
-	 * Get all apps using the config
-	 *
-	 * @return array an array of app ids
-	 *
-	 * This function returns a list of all apps that have at least one
-	 * entry in the appconfig table.
-	 */
-	public function getApps() {
-		$this->loadConfigValues();
-
-		return $this->getSortedKeys($this->cache);
-	}
-
-	/**
-	 * Get the available keys for an app
-	 *
-	 * @param string $app the app we are looking for
-	 * @return array an array of key names
-	 *
-	 * This function gets all keys of an app. Please note that the values are
-	 * not returned.
-	 */
-	public function getKeys($app) {
-		$this->loadConfigValues();
-
-		if (isset($this->cache[$app])) {
-			return $this->getSortedKeys($this->cache[$app]);
-		}
-
-		return [];
-	}
-
-	public function getSortedKeys($data) {
-		$keys = array_keys($data);
-		sort($keys);
-		return $keys;
-	}
-
-	/**
-	 * Gets the config value
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string $default = null, default value if the key does not exist
-	 * @return string the value or $default
-	 *
-	 * This function gets a value from the appconfig table. If the key does
-	 * not exist the default value will be returned
-	 */
-	public function getValue($app, $key, $default = null) {
-		$this->loadConfigValues();
-
-		if ($this->hasKey($app, $key)) {
-			return $this->cache[$app][$key];
-		}
-
-		return $default;
-	}
-
-	/**
-	 * check if a key is set in the appconfig
-	 *
-	 * @param string $app
-	 * @param string $key
-	 * @return bool
-	 */
-	public function hasKey($app, $key) {
-		$this->loadConfigValues();
-
-		return isset($this->cache[$app][$key]);
-	}
-
-	/**
-	 * Sets a value. If the key did not exist before it will be created.
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string|float|int $value value
-	 * @return bool True if the value was inserted or updated, false if the value was the same
-	 */
-	public function setValue($app, $key, $value) {
-		if (!$this->hasKey($app, $key)) {
-			$inserted = (bool) $this->conn->insertIfNotExist('*PREFIX*appconfig', [
-				'appid' => $app,
-				'configkey' => $key,
-				'configvalue' => $value,
-			], [
-				'appid',
-				'configkey',
-			]);
-
-			if ($inserted) {
-				if (!isset($this->cache[$app])) {
-					$this->cache[$app] = [];
-				}
-
-				$this->cache[$app][$key] = $value;
-				return true;
-			}
-		}
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->update('appconfig')
-			->set('configvalue', $sql->createParameter('configvalue'))
-			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
-			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
-			->setParameter('configvalue', $value)
-			->setParameter('app', $app)
-			->setParameter('configkey', $key);
-
-		/*
+    /** @var array[] */
+    protected $sensitiveValues = [
+        'external' => [
+            '/^sites$/',
+        ],
+        'spreed' => [
+            '/^signaling_ticket_secret$/',
+            '/^turn_server_secret$/',
+            '/^stun_servers$/',
+            '/^turn_servers$/',
+            '/^signaling_servers$/',
+        ],
+        'theming' => [
+            '/^imprintUrl$/',
+            '/^privacyUrl$/',
+            '/^slogan$/',
+            '/^url$/',
+        ],
+        'user_ldap' => [
+            '/^(s..)?ldap_agent_password$/',
+        ],
+    ];
+
+    /** @var \OCP\IDBConnection */
+    protected $conn;
+
+    /** @var array[] */
+    private $cache = [];
+
+    /** @var bool */
+    private $configLoaded = false;
+
+    /**
+     * @param IDBConnection $conn
+     */
+    public function __construct(IDBConnection $conn) {
+        $this->conn = $conn;
+        $this->configLoaded = false;
+    }
+
+    /**
+     * @param string $app
+     * @return array
+     */
+    private function getAppValues($app) {
+        $this->loadConfigValues();
+
+        if (isset($this->cache[$app])) {
+            return $this->cache[$app];
+        }
+
+        return [];
+    }
+
+    /**
+     * Get all apps using the config
+     *
+     * @return array an array of app ids
+     *
+     * This function returns a list of all apps that have at least one
+     * entry in the appconfig table.
+     */
+    public function getApps() {
+        $this->loadConfigValues();
+
+        return $this->getSortedKeys($this->cache);
+    }
+
+    /**
+     * Get the available keys for an app
+     *
+     * @param string $app the app we are looking for
+     * @return array an array of key names
+     *
+     * This function gets all keys of an app. Please note that the values are
+     * not returned.
+     */
+    public function getKeys($app) {
+        $this->loadConfigValues();
+
+        if (isset($this->cache[$app])) {
+            return $this->getSortedKeys($this->cache[$app]);
+        }
+
+        return [];
+    }
+
+    public function getSortedKeys($data) {
+        $keys = array_keys($data);
+        sort($keys);
+        return $keys;
+    }
+
+    /**
+     * Gets the config value
+     *
+     * @param string $app app
+     * @param string $key key
+     * @param string $default = null, default value if the key does not exist
+     * @return string the value or $default
+     *
+     * This function gets a value from the appconfig table. If the key does
+     * not exist the default value will be returned
+     */
+    public function getValue($app, $key, $default = null) {
+        $this->loadConfigValues();
+
+        if ($this->hasKey($app, $key)) {
+            return $this->cache[$app][$key];
+        }
+
+        return $default;
+    }
+
+    /**
+     * check if a key is set in the appconfig
+     *
+     * @param string $app
+     * @param string $key
+     * @return bool
+     */
+    public function hasKey($app, $key) {
+        $this->loadConfigValues();
+
+        return isset($this->cache[$app][$key]);
+    }
+
+    /**
+     * Sets a value. If the key did not exist before it will be created.
+     *
+     * @param string $app app
+     * @param string $key key
+     * @param string|float|int $value value
+     * @return bool True if the value was inserted or updated, false if the value was the same
+     */
+    public function setValue($app, $key, $value) {
+        if (!$this->hasKey($app, $key)) {
+            $inserted = (bool) $this->conn->insertIfNotExist('*PREFIX*appconfig', [
+                'appid' => $app,
+                'configkey' => $key,
+                'configvalue' => $value,
+            ], [
+                'appid',
+                'configkey',
+            ]);
+
+            if ($inserted) {
+                if (!isset($this->cache[$app])) {
+                    $this->cache[$app] = [];
+                }
+
+                $this->cache[$app][$key] = $value;
+                return true;
+            }
+        }
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->update('appconfig')
+            ->set('configvalue', $sql->createParameter('configvalue'))
+            ->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+            ->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+            ->setParameter('configvalue', $value)
+            ->setParameter('app', $app)
+            ->setParameter('configkey', $key);
+
+        /*
 		 * Only limit to the existing value for non-Oracle DBs:
 		 * http://docs.oracle.com/cd/E11882_01/server.112/e26088/conditions002.htm#i1033286
 		 * > Large objects (LOBs) are not supported in comparison conditions.
 		 */
-		if (!($this->conn instanceof OracleConnection)) {
-			// Only update the value when it is not the same
-			$sql->andWhere($sql->expr()->neq('configvalue', $sql->createParameter('configvalue')))
-				->setParameter('configvalue', $value);
-		}
-
-		$changedRow = (bool) $sql->execute();
-
-		$this->cache[$app][$key] = $value;
-
-		return $changedRow;
-	}
-
-	/**
-	 * Deletes a key
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @return boolean
-	 */
-	public function deleteKey($app, $key) {
-		$this->loadConfigValues();
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->delete('appconfig')
-			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
-			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
-			->setParameter('app', $app)
-			->setParameter('configkey', $key);
-		$sql->execute();
-
-		unset($this->cache[$app][$key]);
-		return false;
-	}
-
-	/**
-	 * Remove app from appconfig
-	 *
-	 * @param string $app app
-	 * @return boolean
-	 *
-	 * Removes all keys in appconfig belonging to the app.
-	 */
-	public function deleteApp($app) {
-		$this->loadConfigValues();
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->delete('appconfig')
-			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
-			->setParameter('app', $app);
-		$sql->execute();
-
-		unset($this->cache[$app]);
-		return false;
-	}
-
-	/**
-	 * get multiple values, either the app or key can be used as wildcard by setting it to false
-	 *
-	 * @param string|false $app
-	 * @param string|false $key
-	 * @return array|false
-	 */
-	public function getValues($app, $key) {
-		if (($app !== false) === ($key !== false)) {
-			return false;
-		}
-
-		if ($key === false) {
-			return $this->getAppValues($app);
-		} else {
-			$appIds = $this->getApps();
-			$values = array_map(function ($appId) use ($key) {
-				return isset($this->cache[$appId][$key]) ? $this->cache[$appId][$key] : null;
-			}, $appIds);
-			$result = array_combine($appIds, $values);
-
-			return array_filter($result);
-		}
-	}
-
-	/**
-	 * get all values of the app or and filters out sensitive data
-	 *
-	 * @param string $app
-	 * @return array
-	 */
-	public function getFilteredValues($app) {
-		$values = $this->getValues($app, false);
-
-		if (isset($this->sensitiveValues[$app])) {
-			foreach ($this->sensitiveValues[$app] as $sensitiveKeyExp) {
-				$sensitiveKeys = preg_grep($sensitiveKeyExp, array_keys($values));
-				foreach ($sensitiveKeys as $sensitiveKey) {
-					$values[$sensitiveKey] = IConfig::SENSITIVE_VALUE;
-				}
-			}
-		}
-
-		return $values;
-	}
-
-	/**
-	 * Load all the app config values
-	 */
-	protected function loadConfigValues() {
-		if ($this->configLoaded) {
-			return;
-		}
-
-		$this->cache = [];
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->select('*')
-			->from('appconfig');
-		$result = $sql->execute();
-
-		// we are going to store the result in memory anyway
-		$rows = $result->fetchAll();
-		foreach ($rows as $row) {
-			if (!isset($this->cache[$row['appid']])) {
-				$this->cache[$row['appid']] = [];
-			}
-
-			$this->cache[$row['appid']][$row['configkey']] = $row['configvalue'];
-		}
-		$result->closeCursor();
-
-		$this->configLoaded = true;
-	}
+        if (!($this->conn instanceof OracleConnection)) {
+            // Only update the value when it is not the same
+            $sql->andWhere($sql->expr()->neq('configvalue', $sql->createParameter('configvalue')))
+                ->setParameter('configvalue', $value);
+        }
+
+        $changedRow = (bool) $sql->execute();
+
+        $this->cache[$app][$key] = $value;
+
+        return $changedRow;
+    }
+
+    /**
+     * Deletes a key
+     *
+     * @param string $app app
+     * @param string $key key
+     * @return boolean
+     */
+    public function deleteKey($app, $key) {
+        $this->loadConfigValues();
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->delete('appconfig')
+            ->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+            ->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+            ->setParameter('app', $app)
+            ->setParameter('configkey', $key);
+        $sql->execute();
+
+        unset($this->cache[$app][$key]);
+        return false;
+    }
+
+    /**
+     * Remove app from appconfig
+     *
+     * @param string $app app
+     * @return boolean
+     *
+     * Removes all keys in appconfig belonging to the app.
+     */
+    public function deleteApp($app) {
+        $this->loadConfigValues();
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->delete('appconfig')
+            ->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+            ->setParameter('app', $app);
+        $sql->execute();
+
+        unset($this->cache[$app]);
+        return false;
+    }
+
+    /**
+     * get multiple values, either the app or key can be used as wildcard by setting it to false
+     *
+     * @param string|false $app
+     * @param string|false $key
+     * @return array|false
+     */
+    public function getValues($app, $key) {
+        if (($app !== false) === ($key !== false)) {
+            return false;
+        }
+
+        if ($key === false) {
+            return $this->getAppValues($app);
+        } else {
+            $appIds = $this->getApps();
+            $values = array_map(function ($appId) use ($key) {
+                return isset($this->cache[$appId][$key]) ? $this->cache[$appId][$key] : null;
+            }, $appIds);
+            $result = array_combine($appIds, $values);
+
+            return array_filter($result);
+        }
+    }
+
+    /**
+     * get all values of the app or and filters out sensitive data
+     *
+     * @param string $app
+     * @return array
+     */
+    public function getFilteredValues($app) {
+        $values = $this->getValues($app, false);
+
+        if (isset($this->sensitiveValues[$app])) {
+            foreach ($this->sensitiveValues[$app] as $sensitiveKeyExp) {
+                $sensitiveKeys = preg_grep($sensitiveKeyExp, array_keys($values));
+                foreach ($sensitiveKeys as $sensitiveKey) {
+                    $values[$sensitiveKey] = IConfig::SENSITIVE_VALUE;
+                }
+            }
+        }
+
+        return $values;
+    }
+
+    /**
+     * Load all the app config values
+     */
+    protected function loadConfigValues() {
+        if ($this->configLoaded) {
+            return;
+        }
+
+        $this->cache = [];
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->select('*')
+            ->from('appconfig');
+        $result = $sql->execute();
+
+        // we are going to store the result in memory anyway
+        $rows = $result->fetchAll();
+        foreach ($rows as $row) {
+            if (!isset($this->cache[$row['appid']])) {
+                $this->cache[$row['appid']] = [];
+            }
+
+            $this->cache[$row['appid']][$row['configkey']] = $row['configvalue'];
+        }
+        $result->closeCursor();
+
+        $this->configLoaded = true;
+    }
 }

lib/private/DB/SchemaWrapper.php

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
 	 */
 	public function getTableNamesWithoutPrefix() {
 		$tableNames = $this->schema->getTableNames();
-		return array_map(function ($tableName) {
+		return array_map(function($tableName) {
 			if (strpos($tableName, $this->connection->getPrefix()) === 0) {
 				return substr($tableName, strlen($this->connection->getPrefix()));
 			}
@@ -80,7 +80,7 @@ 
 	 * @throws \Doctrine\DBAL\Schema\SchemaException
 	 */
 	public function getTable($tableName) {
-		return $this->schema->getTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->getTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 * @return boolean
 	 */
 	public function hasTable($tableName) {
-		return $this->schema->hasTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->hasTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 * @return \Doctrine\DBAL\Schema\Table
 	 */
 	public function createTable($tableName) {
-		return $this->schema->createTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->createTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
 	public function dropTable($tableName) {
 		$this->tablesToDelete[$tableName] = true;
-		return $this->schema->dropTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->dropTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**

Indentation +103 added lines, -103 removed lines

@@ -29,107 +29,107 @@
 
 class SchemaWrapper implements ISchemaWrapper {
 
-	/** @var IDBConnection|Connection */
-	protected $connection;
-
-	/** @var Schema */
-	protected $schema;
-
-	/** @var array */
-	protected $tablesToDelete = [];
-
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		$this->schema = $this->connection->createSchema();
-	}
-
-	public function getWrappedSchema() {
-		return $this->schema;
-	}
-
-	public function performDropTableCalls() {
-		foreach ($this->tablesToDelete as $tableName => $true) {
-			$this->connection->dropTable($tableName);
-			unset($this->tablesToDelete[$tableName]);
-		}
-	}
-
-	/**
-	 * Gets all table names
-	 *
-	 * @return array
-	 */
-	public function getTableNamesWithoutPrefix() {
-		$tableNames = $this->schema->getTableNames();
-		return array_map(function ($tableName) {
-			if (strpos($tableName, $this->connection->getPrefix()) === 0) {
-				return substr($tableName, strlen($this->connection->getPrefix()));
-			}
-
-			return $tableName;
-		}, $tableNames);
-	}
-
-	// Overwritten methods
-
-	/**
-	 * @return array
-	 */
-	public function getTableNames() {
-		return $this->schema->getTableNames();
-	}
-
-	/**
-	 * @param string $tableName
-	 *
-	 * @return \Doctrine\DBAL\Schema\Table
-	 * @throws \Doctrine\DBAL\Schema\SchemaException
-	 */
-	public function getTable($tableName) {
-		return $this->schema->getTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Does this schema have a table with the given name?
-	 *
-	 * @param string $tableName
-	 *
-	 * @return boolean
-	 */
-	public function hasTable($tableName) {
-		return $this->schema->hasTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Creates a new table.
-	 *
-	 * @param string $tableName
-	 * @return \Doctrine\DBAL\Schema\Table
-	 */
-	public function createTable($tableName) {
-		return $this->schema->createTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Drops a table from the schema.
-	 *
-	 * @param string $tableName
-	 * @return \Doctrine\DBAL\Schema\Schema
-	 */
-	public function dropTable($tableName) {
-		$this->tablesToDelete[$tableName] = true;
-		return $this->schema->dropTable($this->connection->getPrefix() . $tableName);
-	}
-
-	/**
-	 * Gets all tables of this schema.
-	 *
-	 * @return \Doctrine\DBAL\Schema\Table[]
-	 */
-	public function getTables() {
-		return $this->schema->getTables();
-	}
+    /** @var IDBConnection|Connection */
+    protected $connection;
+
+    /** @var Schema */
+    protected $schema;
+
+    /** @var array */
+    protected $tablesToDelete = [];
+
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        $this->schema = $this->connection->createSchema();
+    }
+
+    public function getWrappedSchema() {
+        return $this->schema;
+    }
+
+    public function performDropTableCalls() {
+        foreach ($this->tablesToDelete as $tableName => $true) {
+            $this->connection->dropTable($tableName);
+            unset($this->tablesToDelete[$tableName]);
+        }
+    }
+
+    /**
+     * Gets all table names
+     *
+     * @return array
+     */
+    public function getTableNamesWithoutPrefix() {
+        $tableNames = $this->schema->getTableNames();
+        return array_map(function ($tableName) {
+            if (strpos($tableName, $this->connection->getPrefix()) === 0) {
+                return substr($tableName, strlen($this->connection->getPrefix()));
+            }
+
+            return $tableName;
+        }, $tableNames);
+    }
+
+    // Overwritten methods
+
+    /**
+     * @return array
+     */
+    public function getTableNames() {
+        return $this->schema->getTableNames();
+    }
+
+    /**
+     * @param string $tableName
+     *
+     * @return \Doctrine\DBAL\Schema\Table
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function getTable($tableName) {
+        return $this->schema->getTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Does this schema have a table with the given name?
+     *
+     * @param string $tableName
+     *
+     * @return boolean
+     */
+    public function hasTable($tableName) {
+        return $this->schema->hasTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Creates a new table.
+     *
+     * @param string $tableName
+     * @return \Doctrine\DBAL\Schema\Table
+     */
+    public function createTable($tableName) {
+        return $this->schema->createTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Drops a table from the schema.
+     *
+     * @param string $tableName
+     * @return \Doctrine\DBAL\Schema\Schema
+     */
+    public function dropTable($tableName) {
+        $this->tablesToDelete[$tableName] = true;
+        return $this->schema->dropTable($this->connection->getPrefix() . $tableName);
+    }
+
+    /**
+     * Gets all tables of this schema.
+     *
+     * @return \Doctrine\DBAL\Schema\Table[]
+     */
+    public function getTables() {
+        return $this->schema->getTables();
+    }
 }

lib/private/Command/FileAccess.php

Indentation +7 added lines, -7 removed lines

@@ -25,12 +25,12 @@
 use OCP\IUser;
 
 trait FileAccess {
-	protected function setupFS(IUser $user) {
-		\OC_Util::setupFS($user->getUID());
-	}
+    protected function setupFS(IUser $user) {
+        \OC_Util::setupFS($user->getUID());
+    }
 
-	protected function getUserFolder(IUser $user) {
-		$this->setupFS($user);
-		return \OC::$server->getUserFolder($user->getUID());
-	}
+    protected function getUserFolder(IUser $user) {
+        $this->setupFS($user);
+        return \OC::$server->getUserFolder($user->getUID());
+    }
 }

lib/private/Contacts/ContactsMenu/Manager.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 	 * @return IEntry[]
 	 */
 	private function sortEntries(array $entries) {
-		usort($entries, function (IEntry $entryA, IEntry $entryB) {
+		usort($entries, function(IEntry $entryA, IEntry $entryB) {
 			return strcasecmp($entryA->getFullName(), $entryB->getFullName());
 		});
 		return $entries;

Indentation +86 added lines, -86 removed lines

@@ -32,91 +32,91 @@
 
 class Manager {
 
-	/** @var ContactsStore */
-	private $store;
-
-	/** @var ActionProviderStore */
-	private $actionProviderStore;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * @param ContactsStore $store
-	 * @param ActionProviderStore $actionProviderStore
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(ContactsStore $store, ActionProviderStore $actionProviderStore, IAppManager $appManager, IConfig $config) {
-		$this->store = $store;
-		$this->actionProviderStore = $actionProviderStore;
-		$this->appManager = $appManager;
-		$this->config = $config;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string $filter
-	 * @return array
-	 */
-	public function getEntries(IUser $user, $filter) {
-		$maxAutocompleteResults = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', 25);
-		$minSearchStringLength = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0);
-		$topEntries = [];
-		if (strlen($filter) >= $minSearchStringLength) {
-			$entries = $this->store->getContacts($user, $filter);
-
-			$sortedEntries = $this->sortEntries($entries);
-			$topEntries = array_slice($sortedEntries, 0, $maxAutocompleteResults);
-			$this->processEntries($topEntries, $user);
-		}
-
-		$contactsEnabled = $this->appManager->isEnabledForUser('contacts', $user);
-		return [
-			'contacts' => $topEntries,
-			'contactsAppEnabled' => $contactsEnabled,
-		];
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param integer $shareType
-	 * @param string $shareWith
-	 * @return IEntry
-	 */
-	public function findOne(IUser $user, $shareType, $shareWith) {
-		$entry = $this->store->findOne($user, $shareType, $shareWith);
-		if ($entry) {
-			$this->processEntries([$entry], $user);
-		}
-
-		return $entry;
-	}
-
-	/**
-	 * @param IEntry[] $entries
-	 * @return IEntry[]
-	 */
-	private function sortEntries(array $entries) {
-		usort($entries, function (IEntry $entryA, IEntry $entryB) {
-			return strcasecmp($entryA->getFullName(), $entryB->getFullName());
-		});
-		return $entries;
-	}
-
-	/**
-	 * @param IEntry[] $entries
-	 * @param IUser $user
-	 */
-	private function processEntries(array $entries, IUser $user) {
-		$providers = $this->actionProviderStore->getProviders($user);
-		foreach ($entries as $entry) {
-			foreach ($providers as $provider) {
-				$provider->process($entry);
-			}
-		}
-	}
+    /** @var ContactsStore */
+    private $store;
+
+    /** @var ActionProviderStore */
+    private $actionProviderStore;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * @param ContactsStore $store
+     * @param ActionProviderStore $actionProviderStore
+     * @param IAppManager $appManager
+     */
+    public function __construct(ContactsStore $store, ActionProviderStore $actionProviderStore, IAppManager $appManager, IConfig $config) {
+        $this->store = $store;
+        $this->actionProviderStore = $actionProviderStore;
+        $this->appManager = $appManager;
+        $this->config = $config;
+    }
+
+    /**
+     * @param IUser $user
+     * @param string $filter
+     * @return array
+     */
+    public function getEntries(IUser $user, $filter) {
+        $maxAutocompleteResults = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', 25);
+        $minSearchStringLength = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0);
+        $topEntries = [];
+        if (strlen($filter) >= $minSearchStringLength) {
+            $entries = $this->store->getContacts($user, $filter);
+
+            $sortedEntries = $this->sortEntries($entries);
+            $topEntries = array_slice($sortedEntries, 0, $maxAutocompleteResults);
+            $this->processEntries($topEntries, $user);
+        }
+
+        $contactsEnabled = $this->appManager->isEnabledForUser('contacts', $user);
+        return [
+            'contacts' => $topEntries,
+            'contactsAppEnabled' => $contactsEnabled,
+        ];
+    }
+
+    /**
+     * @param IUser $user
+     * @param integer $shareType
+     * @param string $shareWith
+     * @return IEntry
+     */
+    public function findOne(IUser $user, $shareType, $shareWith) {
+        $entry = $this->store->findOne($user, $shareType, $shareWith);
+        if ($entry) {
+            $this->processEntries([$entry], $user);
+        }
+
+        return $entry;
+    }
+
+    /**
+     * @param IEntry[] $entries
+     * @return IEntry[]
+     */
+    private function sortEntries(array $entries) {
+        usort($entries, function (IEntry $entryA, IEntry $entryB) {
+            return strcasecmp($entryA->getFullName(), $entryB->getFullName());
+        });
+        return $entries;
+    }
+
+    /**
+     * @param IEntry[] $entries
+     * @param IUser $user
+     */
+    private function processEntries(array $entries, IUser $user) {
+        $providers = $this->actionProviderStore->getProviders($user);
+        foreach ($entries as $entry) {
+            foreach ($providers as $provider) {
+                $provider->process($entry);
+            }
+        }
+    }
 
 }

lib/private/Contacts/ContactsMenu/Entry.php

Indentation +136 added lines, -136 removed lines

@@ -29,140 +29,140 @@
 
 class Entry implements IEntry {
 
-	/** @var string|int|null */
-	private $id = null;
-
-	/** @var string */
-	private $fullName = '';
-
-	/** @var string[] */
-	private $emailAddresses = [];
-
-	/** @var string|null */
-	private $avatar;
-
-	/** @var IAction[] */
-	private $actions = [];
-
-	/** @var array */
-	private $properties = [];
-
-	/**
-	 * @param string $id
-	 */
-	public function setId($id) {
-		$this->id = $id;
-	}
-
-	/**
-	 * @param string $displayName
-	 */
-	public function setFullName($displayName) {
-		$this->fullName = $displayName;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getFullName() {
-		return $this->fullName;
-	}
-
-	/**
-	 * @param string $address
-	 */
-	public function addEMailAddress($address) {
-		$this->emailAddresses[] = $address;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEMailAddresses() {
-		return $this->emailAddresses;
-	}
-
-	/**
-	 * @param string $avatar
-	 */
-	public function setAvatar($avatar) {
-		$this->avatar = $avatar;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAvatar() {
-		return $this->avatar;
-	}
-
-	/**
-	 * @param IAction $action
-	 */
-	public function addAction(IAction $action) {
-		$this->actions[] = $action;
-		$this->sortActions();
-	}
-
-	/**
-	 * @return IAction[]
-	 */
-	public function getActions() {
-		return $this->actions;
-	}
-
-	/**
-	 * sort the actions by priority and name
-	 */
-	private function sortActions() {
-		usort($this->actions, function (IAction $action1, IAction $action2) {
-			$prio1 = $action1->getPriority();
-			$prio2 = $action2->getPriority();
-
-			if ($prio1 === $prio2) {
-				// Ascending order for same priority
-				return strcasecmp($action1->getName(), $action2->getName());
-			}
-
-			// Descending order when priority differs
-			return $prio2 - $prio1;
-		});
-	}
-
-	/**
-	 * @param array $contact key-value array containing additional properties
-	 */
-	public function setProperties(array $contact) {
-		$this->properties = $contact;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function getProperty($key) {
-		if (!isset($this->properties[$key])) {
-			return null;
-		}
-		return $this->properties[$key];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function jsonSerialize() {
-		$topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
-		$otherActions = array_map(function (IAction $action) {
-			return $action->jsonSerialize();
-		}, array_slice($this->actions, 1));
-
-		return [
-			'id' => $this->id,
-			'fullName' => $this->fullName,
-			'avatar' => $this->getAvatar(),
-			'topAction' => $topAction,
-			'actions' => $otherActions,
-			'lastMessage' => '',
-		];
-	}
+    /** @var string|int|null */
+    private $id = null;
+
+    /** @var string */
+    private $fullName = '';
+
+    /** @var string[] */
+    private $emailAddresses = [];
+
+    /** @var string|null */
+    private $avatar;
+
+    /** @var IAction[] */
+    private $actions = [];
+
+    /** @var array */
+    private $properties = [];
+
+    /**
+     * @param string $id
+     */
+    public function setId($id) {
+        $this->id = $id;
+    }
+
+    /**
+     * @param string $displayName
+     */
+    public function setFullName($displayName) {
+        $this->fullName = $displayName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFullName() {
+        return $this->fullName;
+    }
+
+    /**
+     * @param string $address
+     */
+    public function addEMailAddress($address) {
+        $this->emailAddresses[] = $address;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEMailAddresses() {
+        return $this->emailAddresses;
+    }
+
+    /**
+     * @param string $avatar
+     */
+    public function setAvatar($avatar) {
+        $this->avatar = $avatar;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAvatar() {
+        return $this->avatar;
+    }
+
+    /**
+     * @param IAction $action
+     */
+    public function addAction(IAction $action) {
+        $this->actions[] = $action;
+        $this->sortActions();
+    }
+
+    /**
+     * @return IAction[]
+     */
+    public function getActions() {
+        return $this->actions;
+    }
+
+    /**
+     * sort the actions by priority and name
+     */
+    private function sortActions() {
+        usort($this->actions, function (IAction $action1, IAction $action2) {
+            $prio1 = $action1->getPriority();
+            $prio2 = $action2->getPriority();
+
+            if ($prio1 === $prio2) {
+                // Ascending order for same priority
+                return strcasecmp($action1->getName(), $action2->getName());
+            }
+
+            // Descending order when priority differs
+            return $prio2 - $prio1;
+        });
+    }
+
+    /**
+     * @param array $contact key-value array containing additional properties
+     */
+    public function setProperties(array $contact) {
+        $this->properties = $contact;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getProperty($key) {
+        if (!isset($this->properties[$key])) {
+            return null;
+        }
+        return $this->properties[$key];
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize() {
+        $topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
+        $otherActions = array_map(function (IAction $action) {
+            return $action->jsonSerialize();
+        }, array_slice($this->actions, 1));
+
+        return [
+            'id' => $this->id,
+            'fullName' => $this->fullName,
+            'avatar' => $this->getAvatar(),
+            'topAction' => $topAction,
+            'actions' => $otherActions,
+            'lastMessage' => '',
+        ];
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -115,7 +115,7 @@ 
 	 * sort the actions by priority and name
 	 */
 	private function sortActions() {
-		usort($this->actions, function (IAction $action1, IAction $action2) {
+		usort($this->actions, function(IAction $action1, IAction $action2) {
 			$prio1 = $action1->getPriority();
 			$prio2 = $action2->getPriority();
 
@@ -152,7 +152,7 @@ 
 	 */
 	public function jsonSerialize() {
 		$topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
-		$otherActions = array_map(function (IAction $action) {
+		$otherActions = array_map(function(IAction $action) {
 			return $action->jsonSerialize();
 		}, array_slice($this->actions, 1));
 

lib/private/Contacts/ContactsMenu/ActionProviderStore.php

Indentation +75 added lines, -75 removed lines

@@ -35,79 +35,79 @@
 
 class ActionProviderStore {
 
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	/** @var AppManager */
-	private $appManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param IServerContainer $serverContainer
-	 * @param AppManager $appManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(IServerContainer $serverContainer, AppManager $appManager, ILogger $logger) {
-		$this->serverContainer = $serverContainer;
-		$this->appManager = $appManager;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return IProvider[]
-	 * @throws Exception
-	 */
-	public function getProviders(IUser $user) {
-		$appClasses = $this->getAppProviderClasses($user);
-		$providerClasses = $this->getServerProviderClasses();
-		$allClasses = array_merge($providerClasses, $appClasses);
-		$providers = [];
-
-		foreach ($allClasses as $class) {
-			try {
-				$providers[] = $this->serverContainer->query($class);
-			} catch (QueryException $ex) {
-				$this->logger->logException($ex, [
-					'message' => "Could not load contacts menu action provider $class",
-					'app' => 'core',
-				]);
-				throw new Exception("Could not load contacts menu action provider");
-			}
-		}
-
-		return $providers;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	private function getServerProviderClasses() {
-		return [
-			EMailProvider::class,
-		];
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return string[]
-	 */
-	private function getAppProviderClasses(IUser $user) {
-		return array_reduce($this->appManager->getEnabledAppsForUser($user), function ($all, $appId) {
-			$info = $this->appManager->getAppInfo($appId);
-
-			if (!isset($info['contactsmenu']) || !isset($info['contactsmenu'])) {
-				// Nothing to add
-				return $all;
-			}
-
-			$providers = array_reduce($info['contactsmenu'], function ($all, $provider) {
-				return array_merge($all, [$provider]);
-			}, []);
-
-			return array_merge($all, $providers);
-		}, []);
-	}
+    /** @var IServerContainer */
+    private $serverContainer;
+
+    /** @var AppManager */
+    private $appManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param IServerContainer $serverContainer
+     * @param AppManager $appManager
+     * @param ILogger $logger
+     */
+    public function __construct(IServerContainer $serverContainer, AppManager $appManager, ILogger $logger) {
+        $this->serverContainer = $serverContainer;
+        $this->appManager = $appManager;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param IUser $user
+     * @return IProvider[]
+     * @throws Exception
+     */
+    public function getProviders(IUser $user) {
+        $appClasses = $this->getAppProviderClasses($user);
+        $providerClasses = $this->getServerProviderClasses();
+        $allClasses = array_merge($providerClasses, $appClasses);
+        $providers = [];
+
+        foreach ($allClasses as $class) {
+            try {
+                $providers[] = $this->serverContainer->query($class);
+            } catch (QueryException $ex) {
+                $this->logger->logException($ex, [
+                    'message' => "Could not load contacts menu action provider $class",
+                    'app' => 'core',
+                ]);
+                throw new Exception("Could not load contacts menu action provider");
+            }
+        }
+
+        return $providers;
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getServerProviderClasses() {
+        return [
+            EMailProvider::class,
+        ];
+    }
+
+    /**
+     * @param IUser $user
+     * @return string[]
+     */
+    private function getAppProviderClasses(IUser $user) {
+        return array_reduce($this->appManager->getEnabledAppsForUser($user), function ($all, $appId) {
+            $info = $this->appManager->getAppInfo($appId);
+
+            if (!isset($info['contactsmenu']) || !isset($info['contactsmenu'])) {
+                // Nothing to add
+                return $all;
+            }
+
+            $providers = array_reduce($info['contactsmenu'], function ($all, $provider) {
+                return array_merge($all, [$provider]);
+            }, []);
+
+            return array_merge($all, $providers);
+        }, []);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 	 * @return string[]
 	 */
 	private function getAppProviderClasses(IUser $user) {
-		return array_reduce($this->appManager->getEnabledAppsForUser($user), function ($all, $appId) {
+		return array_reduce($this->appManager->getEnabledAppsForUser($user), function($all, $appId) {
 			$info = $this->appManager->getAppInfo($appId);
 
 			if (!isset($info['contactsmenu']) || !isset($info['contactsmenu'])) {
@@ -103,7 +103,7 @@ 
 				return $all;
 			}
 
-			$providers = array_reduce($info['contactsmenu'], function ($all, $provider) {
+			$providers = array_reduce($info['contactsmenu'], function($all, $provider) {
 				return array_merge($all, [$provider]);
 			}, []);
 

apps/dav/lib/Files/Sharing/FilesDropPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		$path = array_pop($path);
 
 		$newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
-		$url = $request->getBaseUrl() . $newName;
+		$url = $request->getBaseUrl().$newName;
 		$request->setUrl($url);
 	}
 }

Indentation +38 added lines, -38 removed lines

@@ -35,52 +35,52 @@
  */
 class FilesDropPlugin extends ServerPlugin {
 
-	/** @var View */
-	private $view;
+    /** @var View */
+    private $view;
 
-	/** @var bool */
-	private $enabled = false;
+    /** @var bool */
+    private $enabled = false;
 
-	/**
-	 * @param View $view
-	 */
-	public function setView($view) {
-		$this->view = $view;
-	}
+    /**
+     * @param View $view
+     */
+    public function setView($view) {
+        $this->view = $view;
+    }
 
-	public function enable() {
-		$this->enabled = true;
-	}
+    public function enable() {
+        $this->enabled = true;
+    }
 
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 * @throws MethodNotAllowed
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->on('beforeMethod:*', [$this, 'beforeMethod'], 999);
-		$this->enabled = false;
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     * @throws MethodNotAllowed
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->on('beforeMethod:*', [$this, 'beforeMethod'], 999);
+        $this->enabled = false;
+    }
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
 
-		if (!$this->enabled) {
-			return;
-		}
+        if (!$this->enabled) {
+            return;
+        }
 
-		if ($request->getMethod() !== 'PUT') {
-			throw new MethodNotAllowed('Only PUT is allowed on files drop');
-		}
+        if ($request->getMethod() !== 'PUT') {
+            throw new MethodNotAllowed('Only PUT is allowed on files drop');
+        }
 
-		$path = explode('/', $request->getPath());
-		$path = array_pop($path);
+        $path = explode('/', $request->getPath());
+        $path = array_pop($path);
 
-		$newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
-		$url = $request->getBaseUrl() . $newName;
-		$request->setUrl($url);
-	}
+        $newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
+        $url = $request->getBaseUrl() . $newName;
+        $request->setUrl($url);
+    }
 }

apps/dav/lib/Command/SyncSystemAddressBook.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		$output->writeln('Syncing users ...');
 		$progress = new ProgressBar($output);
 		$progress->start();
-		$this->syncService->syncInstance(function () use ($progress) {
+		$this->syncService->syncInstance(function() use ($progress) {
 			$progress->advance();
 		});
 

Indentation +28 added lines, -28 removed lines

@@ -31,36 +31,36 @@
 
 class SyncSystemAddressBook extends Command {
 
-	/** @var SyncService */
-	private $syncService;
+    /** @var SyncService */
+    private $syncService;
 
-	/**
-	 * @param SyncService $syncService
-	 */
-	function __construct(SyncService $syncService) {
-		parent::__construct();
-		$this->syncService = $syncService;
-	}
+    /**
+     * @param SyncService $syncService
+     */
+    function __construct(SyncService $syncService) {
+        parent::__construct();
+        $this->syncService = $syncService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:sync-system-addressbook')
-			->setDescription('Synchronizes users to the system addressbook');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:sync-system-addressbook')
+            ->setDescription('Synchronizes users to the system addressbook');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$output->writeln('Syncing users ...');
-		$progress = new ProgressBar($output);
-		$progress->start();
-		$this->syncService->syncInstance(function () use ($progress) {
-			$progress->advance();
-		});
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $output->writeln('Syncing users ...');
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $this->syncService->syncInstance(function () use ($progress) {
+            $progress->advance();
+        });
 
-		$progress->finish();
-		$output->writeln('');
-	}
+        $progress->finish();
+        $output->writeln('');
+    }
 }