[Pkg-owncloud-commits] [owncloud] 58/83: don't check migration status if a file is accessed by a public link
David Prévot
taffit at moszumanska.debian.org
Wed Dec 18 13:05:31 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch 5.0
in repository owncloud.
commit 00cdb380e52955f97950b44efdbb9f74981262cc
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date: Mon Dec 9 12:45:19 2013 +0100
don't check migration status if a file is accessed by a public link
---
apps/files_encryption/lib/util.php | 47 ++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 20 deletions(-)
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 121b1c4..7e88026 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1142,34 +1142,41 @@ class Util {
*/
public function getMigrationStatus() {
- $sql = 'SELECT `migration_status` FROM `*PREFIX*encryption` WHERE `uid` = ?';
+ if ($this->isPublic) {
- $args = array($this->userId);
+ return self::MIGRATION_COMPLETED;
+
+ } else {
- $query = \OCP\DB::prepare($sql);
+ $sql = 'SELECT `migration_status` FROM `*PREFIX*encryption` WHERE `uid` = ?';
- $result = $query->execute($args);
+ $args = array($this->userId);
+
+ $query = \OCP\DB::prepare($sql);
- $migrationStatus = array();
+ $result = $query->execute($args);
- if (\OCP\DB::isError($result)) {
- \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
- } else {
- if ($result->numRows() > 0) {
- $row = $result->fetchRow();
- if (isset($row['migration_status'])) {
- $migrationStatus[] = $row['migration_status'];
+ $migrationStatus = array();
+
+ if (\OCP\DB::isError($result)) {
+ \OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+ } else {
+ if ($result->numRows() > 0) {
+ $row = $result->fetchRow();
+ if (isset($row['migration_status'])) {
+ $migrationStatus[] = $row['migration_status'];
+ }
}
}
- }
- // If no record is found
- if (empty($migrationStatus)) {
- \OCP\Util::writeLog('Encryption library', "Could not get migration status for " . $this->userId . ", no record found", \OCP\Util::ERROR);
- return false;
- // If a record is found
- } else {
- return (int)$migrationStatus[0];
+ // If no record is found
+ if (empty($migrationStatus)) {
+ \OCP\Util::writeLog('Encryption library', "Could not get migration status for " . $this->userId . ", no record found", \OCP\Util::ERROR);
+ return false;
+ // If a record is found
+ } else {
+ return (int) $migrationStatus[0];
+ }
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list