From f6446a64b62e964e043995f6bfeb2118a7dc489a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 19 Nov 2015 17:10:42 +0100
Subject: [PATCH] fixing OCI and others

---
 apps/federation/api/ocsauthapi.php                  | 10 +++++-----
 apps/federation/appinfo/application.php             | 13 -------------
 apps/federation/backgroundjob/getsharedsecret.php   |  1 +
 .../backgroundjob/requestsharedsecret.php           |  1 +
 apps/federation/lib/dbhandler.php                   |  4 ++--
 5 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/apps/federation/api/ocsauthapi.php b/apps/federation/api/ocsauthapi.php
index 3279ae1dd7..42d7113820 100644
--- a/apps/federation/api/ocsauthapi.php
+++ b/apps/federation/api/ocsauthapi.php
@@ -22,10 +22,10 @@
 
 namespace OCA\Federation\API;
 
-use OC\BackgroundJob\JobList;
 use OCA\Federation\DbHandler;
 use OCA\Federation\TrustedServers;
 use OCP\AppFramework\Http;
+use OCP\BackgroundJob\IJobList;
 use OCP\IRequest;
 use OCP\Security\ISecureRandom;
 use OCP\Security\StringUtils;
@@ -45,7 +45,7 @@ class OCSAuthAPI {
 	/** @var ISecureRandom  */
 	private $secureRandom;
 
-	/** @var JobList */
+	/** @var IJobList */
 	private $jobList;
 
 	/** @var TrustedServers */
@@ -55,18 +55,18 @@ class OCSAuthAPI {
 	private $dbHandler;
 
 	/**
-	 * AuthController constructor.
+	 * OCSAuthAPI constructor.
 	 *
 	 * @param IRequest $request
 	 * @param ISecureRandom $secureRandom
-	 * @param JobList $jobList
+	 * @param IJobList $jobList
 	 * @param TrustedServers $trustedServers
 	 * @param DbHandler $dbHandler
 	 */
 	public function __construct(
 		IRequest $request,
 		ISecureRandom $secureRandom,
-		JobList $jobList,
+		IJobList $jobList,
 		TrustedServers $trustedServers,
 		DbHandler $dbHandler
 	) {
diff --git a/apps/federation/appinfo/application.php b/apps/federation/appinfo/application.php
index 72a30f9ae0..350b140b4d 100644
--- a/apps/federation/appinfo/application.php
+++ b/apps/federation/appinfo/application.php
@@ -87,19 +87,6 @@ class Application extends \OCP\AppFramework\App {
 				$c->query('TrustedServers')
 			);
 		});
-
-
-		$container->registerService('AuthController', function (IAppContainer $c) {
-			$server = $c->getServer();
-			return new AuthController(
-				$c->getAppName(),
-				$server->getRequest(),
-				$server->getSecureRandom(),
-				$server->getJobList(),
-				$c->query('TrustedServers'),
-				$c->query('DbHandler')
-			);
-		});
 	}
 
 	private function registerMiddleware() {
diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/backgroundjob/getsharedsecret.php
index dd095ed117..88f2a51045 100644
--- a/apps/federation/backgroundjob/getsharedsecret.php
+++ b/apps/federation/backgroundjob/getsharedsecret.php
@@ -23,6 +23,7 @@
 namespace OCA\Federation\BackgroundJob;
 
 use GuzzleHttp\Exception\ClientException;
+use OC\BackgroundJob\JobList;
 use OC\BackgroundJob\QueuedJob;
 use OCA\Federation\DbHandler;
 use OCA\Federation\TrustedServers;
diff --git a/apps/federation/backgroundjob/requestsharedsecret.php b/apps/federation/backgroundjob/requestsharedsecret.php
index c945757818..f5685e2e0c 100644
--- a/apps/federation/backgroundjob/requestsharedsecret.php
+++ b/apps/federation/backgroundjob/requestsharedsecret.php
@@ -24,6 +24,7 @@ namespace OCA\Federation\BackgroundJob;
 
 
 use GuzzleHttp\Exception\ClientException;
+use OC\BackgroundJob\JobList;
 use OC\BackgroundJob\QueuedJob;
 use OCA\Federation\DbHandler;
 use OCA\Federation\TrustedServers;
diff --git a/apps/federation/lib/dbhandler.php b/apps/federation/lib/dbhandler.php
index 2b57dd7541..976a48f8b0 100644
--- a/apps/federation/lib/dbhandler.php
+++ b/apps/federation/lib/dbhandler.php
@@ -82,7 +82,7 @@ class DbHandler {
 		$result = $query->execute();
 
 		if ($result) {
-			return $this->connection->lastInsertId($this->dbTable);
+			return $this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
 		} else {
 			$message = 'Internal failure, Could not add ownCloud as trusted server: ' . $url;
 			$message_t = $this->l->t('Could not add server');
@@ -110,7 +110,7 @@ class DbHandler {
 	 */
 	public function getAllServer() {
 		$query = $this->connection->getQueryBuilder();
-		$query->select('url', 'id', 'status')->from($this->dbTable);
+		$query->select(['url', 'id', 'status'])->from($this->dbTable);
 		$result = $query->execute()->fetchAll();
 		return $result;
 	}