mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter

This commit is contained in:
Bjoern Schiessle 2013-11-27 15:35:32 +01:00
parent 7240d349da
commit 060e0ad0cd
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_encryption/ajax/getMigrationStatus.php
View File

@ -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;
}
}

42
apps/files_encryption/lib/util.php
View File

@ -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);
\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;
// If a record is found
} else {
return self::MIGRATION_OPEN;
} else {
return false;
}
} else { // If a record is found
return (int)$migrationStatus[0];
}