[Pkg-owncloud-commits] [owncloud] 204/239: with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 060e0ad0cd668529f13a97b866a371e505e8fa3e
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Wed Nov 27 15:35:32 2013 +0100

    with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter
---
 apps/files_encryption/ajax/getMigrationStatus.php |  2 +-
 apps/files_encryption/lib/util.php                | 44 +++++++++++------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/apps/files_encryption/ajax/getMigrationStatus.php b/apps/files_encryption/ajax/getMigrationStatus.php
index a28ebfa..4da035a 100644
--- a/apps/files_encryption/ajax/getMigrationStatus.php
+++ b/apps/files_encryption/ajax/getMigrationStatus.php
@@ -18,7 +18,7 @@ $migrationCompleted = true;
 if ($user !== '' && $password !== '') {
 	if (\OCP\User::checkPassword($user, $password)) {
 		$util = new Util(new \OC_FilesystemView('/'), $user);
-		if ($util->getMigrationStatus($user) !== Util::MIGRATION_COMPLETED) {
+		if ($util->getMigrationStatus() !== Util::MIGRATION_COMPLETED) {
 			$migrationCompleted = false;
 		}
 	}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 62f2f8b..7e46a50 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1253,22 +1253,15 @@ class Util {
 
 	/**
 	 * @brief check if files are already migrated to the encryption system
-	 * @param string $uid user Id
 	 * @return migration status, false = in case of no record
 	 * @note If records are not being returned, check for a hidden space
 	 *       at the start of the uid in db
 	 */
-	public function getMigrationStatus($uid = null) {
-
-		if($uid && \OCP\User::userExists($uid)) {
-			$userId = $uid;
-		} else {
-			$userId = $this->userId;
-		}
+	public function getMigrationStatus() {
 
 		$sql = 'SELECT `migration_status` FROM `*PREFIX*encryption` WHERE `uid` = ?';
 
-		$args = array($userId);
+		$args = array($this->userId);
 		$query = \OCP\DB::prepare($sql);
 
 		$result = $query->execute($args);
@@ -1288,21 +1281,24 @@ class Util {
 
 		// If no record is found
 		if (empty($migrationStatus)) {
-			\OCP\Util::writeLog('Encryption library', "Could not get migration status for " . $userId . ", no record found", \OCP\Util::ERROR);
-			// insert missing entry in DB with status open
-			$sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`,`migration_status`) VALUES (?,?,?,?)';
-			$args = array(
-				$userId,
-				'server-side',
-				0,
-				self::MIGRATION_OPEN
-			);
-			$query = \OCP\DB::prepare($sql);
-			$query->execute($args);
-
-			return self::MIGRATION_OPEN;
-			// If a record is found
-		} else {
+			\OCP\Util::writeLog('Encryption library', "Could not get migration status for " . $this->userId . ", no record found", \OCP\Util::ERROR);
+			// insert missing entry in DB with status open if the user exists
+			if (\OCP\User::userExists($this->userId)) {
+				$sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`,`migration_status`) VALUES (?,?,?,?)';
+				$args = array(
+					$this->userId,
+					'server-side',
+					0,
+					self::MIGRATION_OPEN
+				);
+				$query = \OCP\DB::prepare($sql);
+				$query->execute($args);
+
+				return self::MIGRATION_OPEN;
+			} else {
+				return false;
+			}
+		} else { // If a record is found
 			return (int)$migrationStatus[0];
 		}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git