diff options
author | Morris Jobke <hey@morrisjobke.de> | 2014-08-19 14:05:08 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2014-08-19 14:05:08 +0200 |
commit | b3b335480927a67f3019dfb9933b06e96b487179 (patch) | |
tree | 615c024122709fbafd903bdac1aedcc69c938f52 /lib | |
parent | 5d7deefd95c3108ff4deb17d23e78b39dbe80ee3 (diff) | |
download | nextcloud-server-b3b335480927a67f3019dfb9933b06e96b487179.tar.gz nextcloud-server-b3b335480927a67f3019dfb9933b06e96b487179.zip |
move to public namespace
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/connector/sabre/quotaplugin.php | 2 | ||||
-rw-r--r-- | lib/private/files/filesystem.php | 3 | ||||
-rw-r--r-- | lib/private/files/storage/common.php | 2 | ||||
-rw-r--r-- | lib/private/files/storage/dav.php | 4 | ||||
-rw-r--r-- | lib/private/files/storage/local.php | 2 | ||||
-rw-r--r-- | lib/private/files/storage/wrapper/quota.php | 4 | ||||
-rw-r--r-- | lib/private/helper.php | 4 | ||||
-rwxr-xr-x | lib/private/util.php | 4 | ||||
-rw-r--r-- | lib/public/files/fileinfo.php | 4 |
9 files changed, 15 insertions, 14 deletions
diff --git a/lib/private/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php index a215a772c03..ebcc894d744 100644 --- a/lib/private/connector/sabre/quotaplugin.php +++ b/lib/private/connector/sabre/quotaplugin.php @@ -72,7 +72,7 @@ class OC_Connector_Sabre_QuotaPlugin extends \Sabre\DAV\ServerPlugin { $length -= $chunkHandler->getCurrentSize(); } $freeSpace = $this->getFreeSpace($parentUri); - if ($freeSpace !== \OC\Files\Filesystem::SPACE_UNKNOWN && $length > $freeSpace) { + if ($freeSpace !== \OCP\Files\FileInfo::SPACE_UNKNOWN && $length > $freeSpace) { if (isset($chunkHandler)) { $chunkHandler->cleanup(); } diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index 758a178088c..1dbe66143ac 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -33,9 +33,6 @@ namespace OC\Files; use OC\Files\Storage\Loader; class Filesystem { - const SPACE_NOT_COMPUTED = -1; - const SPACE_UNKNOWN = -2; - const SPACE_UNLIMITED = -3; /** * @var Mount\Manager $mounts diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 08c892cb7fe..4799c865142 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -398,7 +398,7 @@ abstract class Common implements \OC\Files\Storage\Storage { * @return int */ public function free_space($path) { - return \OC\Files\Filesystem::SPACE_UNKNOWN; + return \OCP\Files\FileInfo::SPACE_UNKNOWN; } /** diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php index 93036b8ca44..bd7166c9823 100644 --- a/lib/private/files/storage/dav.php +++ b/lib/private/files/storage/dav.php @@ -243,10 +243,10 @@ class DAV extends \OC\Files\Storage\Common { if (isset($response['{DAV:}quota-available-bytes'])) { return (int)$response['{DAV:}quota-available-bytes']; } else { - return \OC\Files\Filesystem::SPACE_UNKNOWN; + return \OCP\Files\FileInfo::SPACE_UNKNOWN; } } catch (\Exception $e) { - return \OC\Files\Filesystem::SPACE_UNKNOWN; + return \OCP\Files\FileInfo::SPACE_UNKNOWN; } } diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index eeb7af5cd08..9df6cdef2af 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -218,7 +218,7 @@ if (\OC_Util::runningOnWindows()) { public function free_space($path) { $space = @disk_free_space($this->datadir . $path); if ($space === false || is_null($space)) { - return \OC\Files\Filesystem::SPACE_UNKNOWN; + return \OCP\Files\FileInfo::SPACE_UNKNOWN; } return $space; } diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php index f9157ba84f4..bf169e41f13 100644 --- a/lib/private/files/storage/wrapper/quota.php +++ b/lib/private/files/storage/wrapper/quota.php @@ -50,7 +50,7 @@ class Quota extends Wrapper { } return $data['size']; } else { - return \OC\Files\Filesystem::SPACE_NOT_COMPUTED; + return \OCP\Files\FileInfo::SPACE_NOT_COMPUTED; } } @@ -66,7 +66,7 @@ class Quota extends Wrapper { } else { $used = $this->getSize($this->sizeRoot); if ($used < 0) { - return \OC\Files\Filesystem::SPACE_NOT_COMPUTED; + return \OCP\Files\FileInfo::SPACE_NOT_COMPUTED; } else { $free = $this->storage->free_space($path); $quotaFree = max($this->quota - $used, 0); diff --git a/lib/private/helper.php b/lib/private/helper.php index 840869e58c4..17d3840a3ea 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -887,7 +887,7 @@ class OC_Helper { */ public static function freeSpace($dir) { $freeSpace = \OC\Files\Filesystem::free_space($dir); - if ($freeSpace !== \OC\Files\Filesystem::SPACE_UNKNOWN) { + if ($freeSpace !== \OCP\Files\FileInfo::SPACE_UNKNOWN) { $freeSpace = max($freeSpace, 0); return $freeSpace; } else { @@ -960,7 +960,7 @@ class OC_Helper { } if ($includeExtStorage) { $quota = OC_Util::getUserQuota(\OCP\User::getUser()); - if ($quota !== \OC\Files\Filesystem::SPACE_UNLIMITED) { + if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) { // always get free space / total space from root + mount points $path = ''; return self::getGlobalStorageInfo(); diff --git a/lib/private/util.php b/lib/private/util.php index 28cc87bfddd..82c5acee670 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -105,7 +105,7 @@ class OC_Util { if (is_object($storage->getUser())) { $user = $storage->getUser()->getUID(); $quota = OC_Util::getUserQuota($user); - if ($quota !== \OC\Files\Filesystem::SPACE_UNLIMITED) { + if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) { return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota, 'root' => 'files')); } } @@ -1244,7 +1244,7 @@ class OC_Util { if (strpos($url, 'http://') !== 0 && strpos($url, 'https://') !== 0) { throw new Exception('$url must start with https:// or http://', 1); } - + if (function_exists('curl_init')) { $curl = curl_init(); $max_redirects = 10; diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php index b9c8258f21e..ece4409ca55 100644 --- a/lib/public/files/fileinfo.php +++ b/lib/public/files/fileinfo.php @@ -11,6 +11,10 @@ interface FileInfo { const TYPE_FILE = 'file'; const TYPE_FOLDER = 'dir'; + const SPACE_NOT_COMPUTED = -1; + const SPACE_UNKNOWN = -2; + const SPACE_UNLIMITED = -3; + /** * Get the Etag of the file or folder * |